fix: [ultisnips] script type detection should be correct in line's end

hikerpig · Feb 4, 2020 · a8f6e6b · a8f6e6b
1 parent af29aab
commit a8f6e6b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/packages/ultisnips/__tests__/index.spec.ts b/packages/ultisnips/__tests__/index.spec.ts
@@ -116,6 +116,14 @@ describe('parse ultisnips', () => {
           code: 'date',
         },
       })
+
+      const defNewLine = definitions.find(def => def.trigger === 'test_newline')
+      expect(defNewLine.placeholders[0]).toMatchObject<PartialPlaceholder>({
+        scriptInfo: {
+          scriptType: 'js',
+          code: 'new Date()',
+        },
+      })
     })
   })
 })

diff --git a/packages/ultisnips/src/parse/tokenizer.ts b/packages/ultisnips/src/parse/tokenizer.ts
@@ -446,16 +446,16 @@ export class ScriptCodeToken extends Token {
     iter.next() // `
     const nextChars = iter.peek(5)
     let scriptType: ScriptType
-    if (nextChars.substr(0, 2) === '! ') {
+    if (this.containsWord(nextChars, '!')) {
       scriptType = 'shell'
       iter.next(2)
-    } else if (nextChars.substr(0, 3) === '!p ') {
+    } else if (this.containsWord(nextChars, '!p')) {
       scriptType = 'python'
       iter.next(3)
-    } else if (nextChars.substr(0, 3) === '!v ') {
+    } else if (this.containsWord(nextChars, '!v')) {
       scriptType = 'vim'
       iter.next(3)
-    } else if (nextChars.substr(0, 4) === '!js ') {
+    } else if (this.containsWord(nextChars, '!js')) {
       scriptType = 'js'
       iter.next(4)
     }
@@ -465,6 +465,12 @@ export class ScriptCodeToken extends Token {
       this.scriptCode = content
     }
   }
+
+  protected containsWord(chars: string, word: string, validSeperator = [' ', '\n']) {
+    const charsToCheck = chars.substr(0, word.length + 1)
+    const lastChar = charsToCheck[charsToCheck.length - 1]
+    return charsToCheck.startsWith(word) && validSeperator.includes(lastChar)
+  }
 }
 
 export class EndOfTextToken extends Token {

diff --git a/tools/test-tool/snippets/ultisnips/scripts.snippets b/tools/test-tool/snippets/ultisnips/scripts.snippets
@@ -13,3 +13,9 @@ endsnippet
 snippet test_js "javascript code"
 should print date: `!js new Date()`
 endsnippet
+
+# should not contain \n
+snippet test_newline "line ends with !js"
+`!js
+new Date()`
+endsnippet