Limit highlighting of strings to a single line (#107)

* cleanup yaml

Author: h8nor

CHANGELOG.md

@@ -2,6 +2,7 @@
 ## 0.9.6
 _unreleased_
 
+- Limit string highlighting to a single line
 - Associate `.doccls` file extension
 - Engineering: Switch from npm to pnpm
 

syntaxes/vba.yaml-tmlanguage

@@ -11,44 +11,49 @@ fileTypes:
   - .vba
 
 patterns:
-  - include: "#comments"
-  - include: "#keywords"
-  - include: "#metadata"
-  - include: "#numbers"
-  - include: "#storage"
-  - include: "#strings"
-  - include: "#types"
-  - include: "#functions"
+  - include: '#comments'
+  - include: '#functions'
+  - include: '#keywords'
+  - include: '#metadata'
+  - include: '#numbers'
+  - include: '#storage'
+  - include: '#strings'
+  - include: '#types'
   - name: constant.other.vba
     match:  _(?=\s*\n)
+    comment: Break and Combine Statements in Code
 
 repository:
   comments:
-    begin: "(?=')|(?:^(?:|(\\d*)\\s*|[a-zA-Z][a-zA-Z0-9]{0,254}:\\s*)|:\\s*)(?=(?i:Rem ))"
+    begin: (?=')|(?:^(?:(\d*)\s*|[a-zA-Z][a-zA-Z0-9]{0,254}:\s*)|:\s*)(?=(?i:Rem ))
     beginCaptures:
       '1':
         name: constant.numeric.decimal
-    end: "(?<!\\s_)$\n"
+    end: (?<!\s_)$\n
     patterns:
     - name: comment.line.quote
-      match: "'.*"
+      match: \'.*
     - name: comment.line.rem
       match: Rem .*
     - name: comment.line.continuation
-      match: "^.*"
+      match: ^.*
+
+  functions:
+    name: entity.name.function.vba
+    match: (?i:\b(?:(?<=(Call|Function|Sub) ))([a-zA-Z][a-zA-Z0-9_]*)\b)(?=\(\)?)
 
   keywords:
     patterns:
       - name: keyword.conditional.vba
-        match: (?i:\b(Do(( While)|( Until))?|While|Case( Else)?|Else(If)?|For( Each)?|(I)?If|In|New|(Select )?Case|Then|To|Step|With)\b)
+        match: (?i:\b(Do( While| Until)?|While|Case( Else)?|Else(If)?|For( Each)?|(I)?If|In|New|(Select )?Case|Then|To|Step|With)\b)
       - name: keyword.conditional.end.vba
-        match: (?i:\b(End( )?If|End (Select|With)|Next|Wend|Loop(( While)|( Until))?|Exit (For|Do|While))\b)
+        match: (?i:\b(End( )?If|End (Select|With)|Next|Wend|Loop( While| Until)?|Exit (For|Do|While))\b)
       - name: keyword.control.vba
-        match: (?i:(\b(Exit (Function|Property|Sub)|As|And|By(Ref|Val)|Goto|Is|Like|Mod|Not|On Error|Optional|Or|Resume Next|Stop|Xor|Eqv|Imp|TypeOf|AddressOf)\b)|(\b(End)\b(?=\n)))
+        match: (?i:\b(Exit (Function|Property|Sub)|As|And|By(Ref|Val)|Goto|Is|Like|Mod|Not|On Error|Optional|Or|Resume Next|Stop|Xor|Eqv|Imp|TypeOf|AddressOf)\b|(\b(End)\b(?=\n)))
       - name: keyword.io.vba
         match: (?i:\b(Open|Close|Line Input|Lock|Unlock|Print|Seek|Get|Put|Write)\b)
       - name: keyword.io.vba
-        match: "(?i:\\b(Input)(?= #))"
+        match: (?i:\b(Input)(?= \#))
       - name: keyword.other.vba
         match: (?i:\b(Attribute|Call|End (Function|Property|Sub|Type|Enum)|(Const|Function|Property|Sub|Type|Enum)|Declare|PtrSafe|WithEvents|Event|RaiseEvent|Implements)\b)
       - name: keyword.other.option.vba
@@ -58,27 +63,23 @@ repository:
       - name: constant.language.vba
         match: (?i)\b(Empty|False|Nothing|Null|True)\b
 
-  functions:
-    name: entity.name.function.vba
-    match: (?i:\b(?:(?<=Call )|(?<=Function )|(?<=Sub ))[a-zA-Z][a-zA-Z0-9_]*\b)(?=\(\)?)
-
   metadata:
     name: metadata.vba
-    begin: "(?i)^\\s*(BEGIN)\\b"
+    begin: (?i)^\s*(BEGIN)\b
     beginCaptures:
       '1':
-        name: "keyword.metadata.vba"
-    end: "(?i)^\\s*(END)\\b"
+        name: keyword.metadata.vba
+    end: (?i)^\s*(END)\b
     endCaptures:
       '0':
-        name: "keyword.metadata.vba"
+        name: keyword.metadata.vba
     patterns:
-      - include: "source.vba"
+      - include: 'source.vba'
 
   numbers:
     patterns:
       - name: constant.numeric.date
-        match: '(?i)#((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)|[0-9]{1,2})(-|\/)[0-9]{1,2}((-|\/)[0-9]{1,4})?#'
+        match: (?i)\#((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)|[0-9]{1,2})(-|\/)[0-9]{1,2}((-|\/)[0-9]{1,4})?\#
       - name: constant.numeric.decimal
         match: (?<!\w)-?\d+(\.\d+)?
       - name: constant.numeric.octal
@@ -92,9 +93,9 @@ repository:
         match: (?i)\b(Class|Const|Dim|(G|L|S)et|ReDim( Preserve)?|Erase|Static)\b
 
   strings:
-    name: string.quoted.double
-    begin: '"'
-    end: '"'
+    patterns:
+    - name: string.quoted.double
+      match: \"[^\n\r\"]*"
 
   types:
     patterns: