diff --git a/.gitignore b/.gitignore index 8f33380..459a387 100644 --- a/.gitignore +++ b/.gitignore @@ -13,12 +13,12 @@ 2022* do_process.bak2017-11-06_file-test rust/*/target/* -#vim/syntax/README.md +vim/syntax/README.md vim/syntax/timetracker.vim.hide vim/syntax/timetracker.vim.tmp staging test.py test.sh timetracker.py-pre-incident-fixup -#toggle_remote.sh +toggle_remote.sh work diff --git a/toggle_remote.sh b/toggle_remote.sh deleted file mode 100755 index 92d623e..0000000 --- a/toggle_remote.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/zsh - -readme=$(grep vim/syntax/README.md .gitignore) - -if [[ "${readme}" =~ ^# ]]; then # we're switching to Pindrop GitHub - mv vim/syntax/timetracker.vim{,.hide} - mv vim/syntax/timetracker.vim{.tmp,} - /Users/tblancher/homebrew/bin/sed -Ei \ - 's,^#(vim/syntax/README.md),\1,;s,^#(toggle_remote.sh),\1,' .gitignore - git rm --cached toggle_remote.sh vim/syntax/README.md -else # we're switching to git.eldon.me - mv vim/syntax/timetracker.vim{,.tmp} - mv vim/syntax/timetracker.vim{.hide,} - /Users/tblancher/homebrew/bin/sed -Ei \ - 's,^(vim/syntax/README.md),#\1,;s,^(toggle_remote.sh),#\1,' .gitignore -fi diff --git a/vim/syntax/README.md b/vim/syntax/README.md deleted file mode 100644 index 4fc0a1c..0000000 --- a/vim/syntax/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# timetracker.vim syntax file and Git - -The _timetracker.vim_ syntax file I use at my employer contains customer names -so it's easy to tell the parts of my timetracker log lines are for particular -customers (or other important entities). Since this information is sensitive, -I am sanitizing it before I post it to my personal, public-facing Git repo on -git.eldon.me. - -Just run `./toggle_remote.sh` and it should do the right thing. diff --git a/vim/syntax/timetracker.vim b/vim/syntax/timetracker.vim index bf0794f..d72034c 100644 --- a/vim/syntax/timetracker.vim +++ b/vim/syntax/timetracker.vim @@ -64,9 +64,135 @@ syntax keyword timetrackerStandardOps \ verification \ voiceprint syntax keyword Customers - \ Customer1 - \ Customer2 - \ Customer3 + \ 53rd + \ A Cloud Guru + \ AIG + \ Aetna + \ Affinity + \ Alerus + \ Alliant + \ Ally + \ America + \ American + \ Ameriprise + \ AmerisourceBergen + \ Amerisource + \ Anthem + \ Associated + \ Athene + \ BMO + \ Banamex + \ Bandwidth + \ Bank + \ Banks + \ Bergen + \ Block + \ Broadway + \ C + \ CS + \ Canada + \ Canadian + \ Canvas + \ Capital + \ Cencora + \ Citi + \ CitiBanamex + \ Citibanamex + \ Citizens + \ Colorado + \ Comerica + \ Commission + \ Community + \ CoPERA + \ Corebridge + \ Credit + \ CVS + \ Desert + \ Digital + \ Dish + \ E + \ ETRADE + \ E*TRADE + \ Employment + \ Empower + \ Equifax + \ Equitable + \ FNBO + \ FNBPA + \ FPCU + \ Fargo + \ Federal + \ Fifth + \ Financial + \ First + \ GTE + \ Gen + \ Hancock + \ Hawaiian + \ Homestreet + \ Huntington + \ Jackson + \ John + \ KeyBank + \ Kohls + \ Life + \ Lock + \ Manulife + \ Mass + \ Metro + \ Montreal + \ Morgan + \ Mutual + \ NF + \ NYL + \ National + \ Nationwide + \ Navy + \ Network + \ New + \ Northwestern + \ Norton + \ Of + \ One + \ P + \ PERA + \ PNC + \ Pindrop + \ Plus + \ Prepaid + \ Regions + \ Republic + \ Rowe + \ Royal + \ S3 + \ Santander + \ Securian + \ Sentry + \ South + \ Stanley + \ State + \ Summit + \ Support + \ TIAA + \ Tire + \ T[.] + \ The + \ Third + \ TRADE + \ TripActions + \ US + \ Union + \ United + \ Virginia + \ Walmart + \ Wells + \ West + \ Woodforest + \ WSECU + \ York + \ Zions + \ of + \ the syntax match timetrackerTimestamp /\d\{4}-\%(0[135789]-\%([0-2]\d\|3[01]\)\|\%(1[02]-\%([0-2]\d\|3[01]\)\)\|0[46]-\%([0-2]\d\|30\)\|11-\%([0-2]\d\|30\)\|02-[0-2]\d\) \%([01]\d\|2[0-3]\):\%([0-5]\d\)\%(:[0-5]\d\)\{2}/ contained "syntax match ticket /\(#|CM-|PD-\)\d\+/ @@ -80,7 +206,7 @@ syntax match timetrackerTask /.*/ contained syntax region timestampGroup start=/^/ end=/: / contains=timetrackerTimestamp syntax region errTimestamp matchgroup=timestamp start="^\%(\d\{4}-\%(\%(0[13578]\|1[02]\)-\%([0-2]\d\|3[01]\)\|\%(0[469]\|11\)-\%([0-2]\d\|30\)\|02-[0-2]\d\) \%([01]\d\|2[0-3]\)\%(:[0-5]\d\)\{2}\)\@!" end=": " syntax region category start=/\[/ end=/\]/ contains=timetrackerCategories -syntax region ticket start=/\(#\|CM-\|PD-\|NETENG-\|OPS-\)\d\{-1}/ end=/\d / +syntax region ticket start=/\(#\|CM-\|PD-\|NETENG-\|OPS-\|INC-\)\d\{-1}/ end=/\d / "syntax region item matchgroup=task start=/\]\s[\k ]\+/ end=/$/ contains=ticket