From bd4d92dd8d969fffbe0e2a19a1dd650581361a74 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bitbucket@bruce-hill.com>
Date: Tue, 24 Jul 2018 13:41:50 -0700
Subject: [PATCH] Updated for Nomsu v2

---
 indent/nomsu.vim |  2 +-
 syntax/nomsu.vim | 42 +++++++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/indent/nomsu.vim b/indent/nomsu.vim
index 9c467b8..dfba205 100644
--- a/indent/nomsu.vim
+++ b/indent/nomsu.vim
@@ -24,7 +24,7 @@ function! GetNomsuIndent()
   let previous = getline(previousNum)
   let ind = indent(previousNum)
 
-  if previous =~ '{\.\.}\s*\($\|#\)' || previous =~ '(\.\.)\s*\($\|#\)'
+  if previous =~ '{\.\.}\s*\($\|#\)' || previous =~ '(\.\.)\s*\($\|#\)' || previous =~ ':\s*\($\|#\)'
 \ || previous =~ '\[\.\.\]\s*\($\|#\)' || previous =~ '"\.\."\s*\($\|#\)'
 \ || previous =~ '#$'
     let ind += &tabstop
diff --git a/syntax/nomsu.vim b/syntax/nomsu.vim
index a431eb8..4bbc3a8 100644
--- a/syntax/nomsu.vim
+++ b/syntax/nomsu.vim
@@ -10,46 +10,54 @@ endif
 " Highlight long strings.
 syn sync minlines=100
 
-hi def link nomsuInterpDelim PreProc
+"hi def link nomsuInterpDelim PreProc
+hi nomsuInterpDelim ctermfg=Gray
 syn region nomsuOneLineComment start=/#/ end=/$/
 hi nomsuOneLineComment ctermfg=DarkBlue
 hi def link nomsuOneLineComment Comment
-syn region nomsuComment start=/\(^\z(\s*\)[^\n]*\)\@<=#/ skip=/\n\s*$/ end=/\n\(\z1\s\)\@!/
+syn region nomsuComment start=/\(^\z(\s*\)\)\@<=#/ skip=/\n\s*$/ end=/\n\(\z1\s\)\@!/
 hi nomsuComment ctermfg=DarkBlue
 hi def link nomsuComment Comment
 
-
-syn region nomsuList start=/\[/ end=/$\|\]/ contains=@nomsuAll,nomsuComma nextgroup=nomsuIndex
+syn region nomsuList start=/\[/ end=/\]/ contains=@nomsuAll,nomsuComma nextgroup=nomsuIndex
 hi nomsuList ctermfg=Blue
 
-syn region nomsuDict start=/{/ end=/$\|}/ contains=nomsuColon,nomsuComma,@nomsuAll nextgroup=nomsuIndex
+syn region nomsuDict start=/{/ end=/}/ contains=nomsuColon,nomsuComma,@nomsuAll nextgroup=nomsuIndex
 hi nomsuDict ctermfg=Green
 
-syn region nomsuParenGroup start=/(/ end=/$\|)/ contains=@nomsuAll nextgroup=nomsuIndex
+syn region nomsuParenGroup start=/(/ end=/)/ contains=@nomsuAll nextgroup=nomsuIndex
 hi nomsuParenGroup ctermfg=Yellow
 
 syn match nomsuLongTextStart /"\.\."/ contains=nomsuDotDot contained
 hi def link nomsuLongTextStart String
-syn match nomsuTextBackslash /\\\\/ contained
-hi nomsuTextBackslash ctermfg=Blue
-syn match nomsuTextEscapedQuote /\\"/ contained
-hi nomsuTextEscapedQuote ctermfg=Blue
-syn match nomsuInterp /\\\([%[{"(]\)\@=/ nextgroup=nomsuVar,nomsuText,nomsuList,nomsuDict,nomsuParenGroup contained
+syn match nomsuTextBackslash /\\\(\\\)\@=/ nextgroup=nomsuTextEscapedBackslash contained
+hi nomsuTextBackslash ctermfg=Gray
+syn match nomsuTextEscapedChar /\(\x\{1,3}\|x\x\{1,2}\|.\)/ contained
+hi nomsuTextEscapedChar ctermfg=Magenta cterm=reverse
+syn match nomsuTextEscapedBackslash /./ contained
+hi nomsuTextEscapedBackslash ctermfg=Magenta cterm=reverse
+syn match nomsuTextEscape /\\/ nextgroup=nomsuTextEscapedChar contained
+hi nomsuTextEscape ctermfg=Gray
+syn match nomsuInterp /\\\([%[{(]\)\@=/ nextgroup=nomsuVar,nomsuList,nomsuDict,nomsuParenGroup contained
 hi nomsuInterp ctermfg=Gray
-syn region nomsuInterpDotDot matchgroup=nomsuInterpDelim start=/\\$/ end=/\.\./ contained
+syn region nomsuInterpDotDot matchgroup=nomsuInterpDelim start=/\\\s*$/ end=/\.\./ contained
+hi nomsuInterpDotDot ctermfg=Gray
+syn region nomsuIndentedInterp matchgroup=nomsuInterpDelim start=/\\\((\.\.)\|:\|\[\.\.\]\|{\.\.}\)\s*\(\n\(\s*\n\)*\z(\s*\)\)\@=/
+\            end=/\n\(\z1\)\@!\s*\.\./ contained contains=@nomsuAll
+hi nomsuIndentedInterp ctermfg=Gray
 syn region nomsuLongTextValue start=/^/ end=/$/ contained
-\           contains=nomsuInterp,nomsuInterpDotDot,nomsuTextBackslash
+\           contains=nomsuIndentedInterp,nomsuInterp,nomsuInterpDotDot,nomsuTextBackslash
 hi def link nomsuLongTextValue String
-syn region nomsuLongText start=/\(^\z(\s*\)[^\n]*\)\@<="\.\."/ skip=/^\s*$/ end=/^\(\z1\s\)\@!/
+syn region nomsuLongText start=/\(^\z(\s*\)[^\n]*\)\@<="\.\."/ skip=/\n\s*$/ end=/\n\(\z1\s\)\@!/
 \           contains=nomsuLongTextStart,nomsuLongTextValue
 
-syn region nomsuText start=/\("\.\.\)\@<!"\(\.\."\)\@!/ skip=/\\\\\|\\"/ end=/$\|"/ nextgroup=nomsuIndex
-\                       contains=nomsuInterp,nomsuTextBackslash,nomsuTextEscapedQuote
+syn region nomsuText start=/"\(\.\."\s*$\)\@!/ skip=/\\./ end=/"/ nextgroup=nomsuIndex
+\                       contains=nomsuInterp,nomsuTextEscape
 hi def link nomsuText String
 syn match nomsuTextWord /\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_]\|[^\x00-\xff]\)*/ contained nextgroup=nomsuIndex
 hi def link nomsuTextWord String
 
-syn match nomsuVar /%\([a-zA-Z0-9_]\|[^\x00-\xff]\)*/ nextgroup=nomsuIndex
+syn match nomsuVar /%\(\([a-zA-Z0-9_-]\|[^\x00-\xff]\)\+\([a-zA-Z0-9_-]\|[^\x00-\xff]\)*\)\?/ nextgroup=nomsuIndex
 hi nomsuVar ctermfg=Cyan
 hi def link nomsuVar Identifier