From 62d18ba066ce7c6815fb81b13d2ef3d128898606 Mon Sep 17 00:00:00 2001 From: Walker Inman Date: Wed, 7 Nov 2018 09:48:30 -0500 Subject: [PATCH 1/6] show scaled XYZ values as an error - extreme highlight when XYZ g-code values will be scaled by 1000x --- ftdetect/gcode.vim | 2 +- syntax/ngc.vim | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ftdetect/gcode.vim b/ftdetect/gcode.vim index f17f92f..45c164f 100644 --- a/ftdetect/gcode.vim +++ b/ftdetect/gcode.vim @@ -1,2 +1,2 @@ " vim nc -au BufNewFile,BufRead *.nc,*.ngc setlocal nospell ft=ngc syntax=ngc +au BufNewFile,BufRead *.nc,*.ngc,*.NC setlocal nospell ft=ngc syntax=ngc diff --git a/syntax/ngc.vim b/syntax/ngc.vim index c35575b..46187d5 100644 --- a/syntax/ngc.vim +++ b/syntax/ngc.vim @@ -21,7 +21,7 @@ syntax match ngcProgramID /\(O[0-9][0-9]*\|:[0-9][0-9]*\)/ syntax match ngcIdentifier /#<*[A-Z_0-9]*>*/ syntax match ngcLineNumbers /\(n[0-9][0-9]*\)/ syntax keyword ngcTodo TODO FIXME XXX contained -syntax match ngcComment /(.*)/ contains=ngcTodo +syntax match ngcComment /([^)]*)/ contains=ngcTodo syntax match ngcMessage /(\s*MSG\s*,.*)/ contains=ngcIdentifier syntax match ngcLogOpen /(\s*LOGOPEN\s*,.*)/ syntax match ngcLogClose /(\s*LOGCLOSE\s*)/ @@ -32,14 +32,22 @@ syntax match ngcGCodes /\s*\(g[0-9][0-9]*\)/ syntax match ngcGCodesAlt /\s*\(g[0-9][0-9]*\.[0-9]\)/ syntax match ngcMCodes /\s*\(m[0-9][0-9]*\)/ syntax match ngcAxes /\s*\([abc][-#]*[0-9.][.]*[0-9]*\)/ contains=ngcIdentifier -syntax match ngcXAxis /\s*\([xui][-#]*[0-9.][.]*[0-9]*\)/ contains=ngcIdentifier -syntax match ngcYAxis /\s*\([yvj][-#]*[0-9.][.]*[0-9]*\)/ contains=ngcIdentifier -syntax match ngcZAxis /\s*\([zwk][-#]*[0-9.][.]*[0-9]*\)/ contains=ngcIdentifier +syntax match ngcXAxisScaled /\s*\([xui] *[-+#]\?[1-9][0-9]*\)/ contains=ngcIdentifier +syntax match ngcYAxisScaled /\s*\([yvj] *[-+#]\?[1-9][0-9]*\)/ contains=ngcIdentifier +syntax match ngcZAxisScaled /\s*\([zwk] *[-+#]\?[1-9][0-9]*\)/ contains=ngcIdentifier +syntax match ngcFeedScaled /\s*\(f *#\?[1-9][0-9]*\)/ contains=ngcIdentifier +syntax match ngcXAxis /\s*\([xui] *[-+#]\?[0-9]*\.[0-9]*\)/ contains=ngcIdentifier +syntax match ngcYAxis /\s*\([yvj] *[-+#]\?[0-9]*\.[0-9]*\)/ contains=ngcIdentifier +syntax match ngcZAxis /\s*\([zwk] *[-+#]\?[0-9]*\.[0-9]*\)/ contains=ngcIdentifier +syntax match ngcFeed /\s*\([f] *[#]\?[0-9]*\.[0-9]*\)/ contains=ngcIdentifier syntax match ngcSpecials /\s*\(,[c][#-]*[0-9.][.]*[0-9]*\|[relpqds][-#]*[0-9.][.]*[0-9]*\)\s*/ contains=ngcIdentifier -syntax match ngcFeed /\s*\([f][0-9.][.]*[0-9]*\)/ syntax match ngcTool /[ht][0-9][0-9]*/ syntax match ngcBlockSkip /^\/.*/ +hi link ngcXAxisScaled Error +hi link ngcYAxisScaled Error +hi link ngcZAxisScaled Error +hi link ngcFeedScaled Error highlight ngcFileBlock ctermfg=White ctermbg=Red cterm=bold highlight ngcProgramID ctermfg=White cterm=bold highlight ngcXAxis ctermfg=34 From 0ed08630dd1fe77ca939a45eda7e5953c5a7f545 Mon Sep 17 00:00:00 2001 From: Walker Inman Date: Wed, 7 Nov 2018 17:06:23 -0500 Subject: [PATCH 2/6] show line numbers like line numbers - had a problem where accidentally used M2190 instead of N2190 --- syntax/ngc.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/ngc.vim b/syntax/ngc.vim index 46187d5..e5c30db 100644 --- a/syntax/ngc.vim +++ b/syntax/ngc.vim @@ -64,7 +64,7 @@ highlight link ngcOperator Operator highlight link ngcOperatorPunc Operator highlight link ngcIdentifier Identifier highlight link ngcLabel Label -highlight link ngcLineNumbers Label +highlight link ngcLineNumbers LineNr highlight link ngcTodo Todo highlight link ngcComment Comment highlight link ngcMessage SpecialComment From e2d237e86136a859c06692c74ed902e87571b696 Mon Sep 17 00:00:00 2001 From: Walker Inman Date: Thu, 8 Nov 2018 10:10:10 -0500 Subject: [PATCH 3/6] highlight tools and offsets --- syntax/ngc.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntax/ngc.vim b/syntax/ngc.vim index e5c30db..33c773a 100644 --- a/syntax/ngc.vim +++ b/syntax/ngc.vim @@ -41,7 +41,7 @@ syntax match ngcYAxis /\s*\([yvj] *[-+#]\?[0-9]*\.[0-9]*\)/ contains=ngcIdentifi syntax match ngcZAxis /\s*\([zwk] *[-+#]\?[0-9]*\.[0-9]*\)/ contains=ngcIdentifier syntax match ngcFeed /\s*\([f] *[#]\?[0-9]*\.[0-9]*\)/ contains=ngcIdentifier syntax match ngcSpecials /\s*\(,[c][#-]*[0-9.][.]*[0-9]*\|[relpqds][-#]*[0-9.][.]*[0-9]*\)\s*/ contains=ngcIdentifier -syntax match ngcTool /[ht][0-9][0-9]*/ +syntax match ngcTool /[hdt][0-9][0-9]*/ syntax match ngcBlockSkip /^\/.*/ hi link ngcXAxisScaled Error @@ -78,6 +78,6 @@ highlight link ngcGCodesAlt Keyword highlight link ngcMCodes Keyword highlight link ngcAxes SpecialChar highlight ngcFeed ctermfg=89 -highlight ngcTool ctermfg=94 +highlight link ngcTool EnumeratorName let b:current_syntax = "ngc" From 55b5403b1078554677b5b59cd8a3ee1d9d5c8aa1 Mon Sep 17 00:00:00 2001 From: Walker Inman Date: Thu, 8 Nov 2018 11:07:33 -0500 Subject: [PATCH 4/6] fix do end loop numbering --- syntax/ngc.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/ngc.vim b/syntax/ngc.vim index 33c773a..c05c148 100644 --- a/syntax/ngc.vim +++ b/syntax/ngc.vim @@ -12,7 +12,7 @@ syn case ignore syntax match ngcConstant /\(\-\=[.0-9]*\)/ syntax keyword ngcConditional if else endif -syntax keyword ngcRepeat do while endwhile break continue end goto +syntax keyword ngcRepeat do do1 do2 do3 while endwhile break continue end end1 end2 end3 goto syntax keyword ngcFunction sub endsub call return syntax keyword ngcOperator EQ NE GT GE LT LE ABS ACOS ASIN ATAN COS EXP FIX FUP LN ROUND SIN SQRT TAN MOD AND OR syntax match ngcOperatorPunc "[%\-+*/\[\]]" From 6ab3c32d0c6c668040dcc1a9e8d6dded02b369bf Mon Sep 17 00:00:00 2001 From: Walker Inman Date: Thu, 8 Nov 2018 17:12:48 -0500 Subject: [PATCH 5/6] fix d tag --- syntax/ngc.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/ngc.vim b/syntax/ngc.vim index c05c148..5a0770b 100644 --- a/syntax/ngc.vim +++ b/syntax/ngc.vim @@ -40,7 +40,7 @@ syntax match ngcXAxis /\s*\([xui] *[-+#]\?[0-9]*\.[0-9]*\)/ contains=ngcIdentifi syntax match ngcYAxis /\s*\([yvj] *[-+#]\?[0-9]*\.[0-9]*\)/ contains=ngcIdentifier syntax match ngcZAxis /\s*\([zwk] *[-+#]\?[0-9]*\.[0-9]*\)/ contains=ngcIdentifier syntax match ngcFeed /\s*\([f] *[#]\?[0-9]*\.[0-9]*\)/ contains=ngcIdentifier -syntax match ngcSpecials /\s*\(,[c][#-]*[0-9.][.]*[0-9]*\|[relpqds][-#]*[0-9.][.]*[0-9]*\)\s*/ contains=ngcIdentifier +syntax match ngcSpecials /\s*\(,[c][#-]*[0-9.][.]*[0-9]*\|[relpqs][-#]*[0-9.][.]*[0-9]*\)\s*/ contains=ngcIdentifier syntax match ngcTool /[hdt][0-9][0-9]*/ syntax match ngcBlockSkip /^\/.*/ From 668192895f2eaf288fa80f83d5820b69d9932c63 Mon Sep 17 00:00:00 2001 From: Walker Inman Date: Tue, 4 Dec 2018 00:59:47 -0500 Subject: [PATCH 6/6] better colors for terminal --- syntax/ngc.vim | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/syntax/ngc.vim b/syntax/ngc.vim index 5a0770b..c192ffd 100644 --- a/syntax/ngc.vim +++ b/syntax/ngc.vim @@ -48,14 +48,14 @@ hi link ngcXAxisScaled Error hi link ngcYAxisScaled Error hi link ngcZAxisScaled Error hi link ngcFeedScaled Error -highlight ngcFileBlock ctermfg=White ctermbg=Red cterm=bold -highlight ngcProgramID ctermfg=White cterm=bold -highlight ngcXAxis ctermfg=34 -highlight ngcYAxis ctermfg=20 -highlight ngcZAxis ctermfg=124 -highlight ngcAxes ctermfg=102 -highlight ngcSpecials ctermfg=101 -highlight ngcBlockSkip ctermfg=White cterm=bold +highlight ngcFileBlock ctermfg=white ctermbg=red cterm=bold +highlight ngcProgramID ctermfg=white cterm=bold +highlight ngcXAxis ctermfg=darkgreen +highlight ngcYAxis ctermfg=darkblue +highlight ngcZAxis ctermfg=red +highlight ngcAxes ctermfg=lightgreen +highlight ngcSpecials ctermfg=brown +highlight ngcBlockSkip ctermfg=white cterm=bold highlight link ngcConstant Constant highlight link ngcConditional Conditional highlight link ngcRepeat Repeat @@ -77,7 +77,7 @@ highlight link ngcGCodes Keyword highlight link ngcGCodesAlt Keyword highlight link ngcMCodes Keyword highlight link ngcAxes SpecialChar -highlight ngcFeed ctermfg=89 +highlight ngcFeed ctermfg=magenta highlight link ngcTool EnumeratorName let b:current_syntax = "ngc"