github-linguist 5.3.3 → 6.0.0

data/grammars/source.nmml.json

@@ -1,71 +1,69 @@
 {
-  "fileTypes": [
-    "nmml"
-  ],
-  "foldingStartMarker": "<[^!?/>]+|<!--",
-  "foldingStopMarker": "/>|</[^?>]+|-->",
   "name": "NME Build File",
+  "scopeName": "source.nmml",
   "patterns": [
     {
-      "begin": "<!--",
+      "name": "comment.block.nant",
+      "begin": "\u003c!--",
+      "end": "--\u003e",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.nant"
         }
-      },
-      "end": "-->",
-      "name": "comment.block.nant"
+      }
     },
     {
-      "begin": "(</?)([-_a-zA-Z0-9:]+)",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.tag.nant"
-        },
-        "2": {
-          "name": "entity.name.tag.nant"
-        }
-      },
-      "end": "(/?>)",
       "name": "meta.tag.nant",
+      "begin": "(\u003c/?)([-_a-zA-Z0-9:]+)",
+      "end": "(/?\u003e)",
       "patterns": [
         {
-          "match": " ([a-zA-Z-]+)",
-          "name": "entity.other.attribute-name.nant"
+          "name": "entity.other.attribute-name.nant",
+          "match": " ([a-zA-Z-]+)"
         },
         {
+          "name": "string.quoted.double.nant",
           "begin": "\"",
+          "end": "\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.nant"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.nant"
             }
-          },
-          "name": "string.quoted.double.nant"
+          }
         },
         {
+          "name": "string.quoted.single.nant",
           "begin": "'",
+          "end": "'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.nant"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.nant"
             }
-          },
-          "name": "string.quoted.single.nant"
+          }
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.tag.nant"
+        },
+        "2": {
+          "name": "entity.name.tag.nant"
+        }
+      }
     },
     {
+      "name": "constant.character.entity.nant",
+      "match": "(\u0026)([a-zA-Z]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
       "captures": {
         "1": {
           "name": "punctuation.definition.constant.nant"
@@ -73,15 +71,11 @@
         "3": {
           "name": "punctuation.definition.constant.nant"
         }
-      },
-      "match": "(&)([a-zA-Z]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
-      "name": "constant.character.entity.nant"
+      }
     },
     {
-      "match": "&",
-      "name": "invalid.illegal.bad-ampersand.nant"
+      "name": "invalid.illegal.bad-ampersand.nant",
+      "match": "\u0026"
     }
-  ],
-  "scopeName": "source.nmml",
-  "uuid": "1BA52628-717C-11D9-A948-000D94589AF6"
-}
+  ]
+}

data/grammars/source.nsis.json

@@ -1,158 +1,152 @@
 {
-  "comment": "\n\ttodo: - highlight functions\n\t",
-  "fileTypes": [
-    "nsi",
-    "nsh"
-  ],
   "name": "NSIS",
+  "scopeName": "source.nsis",
   "patterns": [
     {
-      "match": "(\\b|^\\s*)\\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|macro|macroend|makensis|searchparse|searchreplace)\\b",
-      "name": "keyword.compiler.nsis"
+      "name": "keyword.compiler.nsis",
+      "match": "(\\b|^\\s*)\\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|macro|macroend|makensis|searchparse|searchreplace)\\b"
     },
     {
-      "match": "(\\b|^\\s*)(Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\\b",
-      "name": "keyword.command.nsis"
+      "name": "keyword.command.nsis",
+      "match": "(\\b|^\\s*)(Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\\b"
     },
     {
-      "match": "(\\b|^\\s*)\\!(ifdef|ifndef|if|ifmacrodef|ifmacrondef|else|endif)\\b",
-      "name": "keyword.control.nsis"
+      "name": "keyword.control.nsis",
+      "match": "(\\b|^\\s*)\\!(ifdef|ifndef|if|ifmacrodef|ifmacrondef|else|endif)\\b"
     },
     {
-      "match": "(\\b|^\\s*)(?i)\\w+\\:\\:\\w+",
-      "name": "keyword.plugin.nsis"
+      "name": "keyword.plugin.nsis",
+      "match": "(\\b|^\\s*)(?i)\\w+\\:\\:\\w+"
     },
     {
-      "match": "[!<>]?=|<>|<|>",
-      "name": "keyword.operator.comparison.nsis"
+      "name": "keyword.operator.comparison.nsis",
+      "match": "[!\u003c\u003e]?=|\u003c\u003e|\u003c|\u003e"
     },
     {
-      "match": "(\\b|^\\s*)(Function|FunctionEnd|Section|SectionEnd|SectionGroup|SectionGroupEnd|SubSection|SubSectionEnd|PageEx|PageExEnd)\\b",
-      "name": "support.function.nsis"
+      "name": "support.function.nsis",
+      "match": "(\\b|^\\s*)(Function|FunctionEnd|Section|SectionEnd|SectionGroup|SectionGroupEnd|SubSection|SubSectionEnd|PageEx|PageExEnd)\\b"
     },
     {
-      "match": "(\\b|^\\s*)(?i)(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\\b",
-      "name": "support.constant.nsis"
+      "name": "support.constant.nsis",
+      "match": "(\\b|^\\s*)(?i)(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\\b"
     },
     {
-      "match": "\\b(true|on)\\b",
-      "name": "constant.language.boolean.true.nsis"
+      "name": "constant.language.boolean.true.nsis",
+      "match": "\\b(true|on)\\b"
     },
     {
-      "match": "\\b(false|off)\\b",
-      "name": "constant.language.boolean.false.nsis"
+      "name": "constant.language.boolean.false.nsis",
+      "match": "\\b(false|off)\\b"
     },
     {
-      "match": "(\\b|^\\s*)(?i)((un\\.)?components|(un\\.)?custom|(un\\.)?directory|(un\\.)?instfiles|(un\\.)?license|uninstConfirm|admin|all|auto|both|bottom|bzip2|current|force|hide|highest|ifdiff|ifnewer|lastused|leave|left|listonly|lzma|nevershow|none|normal|notset|right|show|silent|silentlog|textonly|top|try|user|Win10|Win7|Win8|WinVista|zlib)\\b",
-      "name": "constant.language.option.nsis"
+      "name": "constant.language.option.nsis",
+      "match": "(\\b|^\\s*)(?i)((un\\.)?components|(un\\.)?custom|(un\\.)?directory|(un\\.)?instfiles|(un\\.)?license|uninstConfirm|admin|all|auto|both|bottom|bzip2|current|force|hide|highest|ifdiff|ifnewer|lastused|leave|left|listonly|lzma|nevershow|none|normal|notset|right|show|silent|silentlog|textonly|top|try|user|Win10|Win7|Win8|WinVista|zlib)\\b"
     },
     {
-      "match": "\\/(?i)(a|BRANDING|CENTER|COMPONENTSONLYONCUSTOM|CUSTOMSTRING\\=|date|e|ENABLECANCEL|FILESONLY|file|FINAL|GLOBAL|gray|ifempty|ifndef|ignorecase|IMGID\\=|ITALIC|LANG\\=|NOCUSTOM|noerrors|NONFATAL|nonfatal|oname\\=|o|REBOOTOK|redef|RESIZETOFIT|r|SHORT|SILENT|SOLID|STRIKE|TRIM|UNDERLINE|utcdate|windows|x)\\b",
-      "name": "constant.language.slash-option.nsis"
+      "name": "constant.language.slash-option.nsis",
+      "match": "\\/(?i)(a|BRANDING|CENTER|COMPONENTSONLYONCUSTOM|CUSTOMSTRING\\=|date|e|ENABLECANCEL|FILESONLY|file|FINAL|GLOBAL|gray|ifempty|ifndef|ignorecase|IMGID\\=|ITALIC|LANG\\=|NOCUSTOM|noerrors|NONFATAL|nonfatal|oname\\=|o|REBOOTOK|redef|RESIZETOFIT|r|SHORT|SILENT|SOLID|STRIKE|TRIM|UNDERLINE|utcdate|windows|x)\\b"
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))\\b",
-      "name": "constant.numeric.nsis"
+      "name": "constant.numeric.nsis",
+      "match": "\\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))\\b"
     },
     {
-      "match": "\\${[\\w]+}",
-      "name": "entity.name.function.nsis"
+      "name": "entity.name.function.nsis",
+      "match": "\\${[\\w]+}"
     },
     {
-      "match": "\\$[\\w]+",
-      "name": "storage.type.function.nsis"
+      "name": "storage.type.function.nsis",
+      "match": "\\$[\\w]+"
     },
     {
+      "name": "string.quoted.back.nsis",
       "begin": "`",
+      "end": "`",
+      "patterns": [
+        {
+          "name": "constant.character.escape.nsis",
+          "match": "\\$\\\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.nsis"
         }
       },
-      "end": "`",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.nsis"
         }
-      },
-      "name": "string.quoted.back.nsis",
-      "patterns": [
-        {
-          "match": "\\$\\\\.",
-          "name": "constant.character.escape.nsis"
-        }
-      ]
+      }
     },
     {
+      "name": "string.quoted.double.nsis",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.nsis",
+          "match": "\\$\\\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.nsis"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.nsis"
         }
-      },
-      "name": "string.quoted.double.nsis",
-      "patterns": [
-        {
-          "match": "\\$\\\\.",
-          "name": "constant.character.escape.nsis"
-        }
-      ]
+      }
     },
     {
+      "name": "string.quoted.single.nsis",
       "begin": "'",
+      "end": "'",
+      "patterns": [
+        {
+          "name": "constant.character.escape.nsis",
+          "match": "\\$\\\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.nsis"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.nsis"
         }
-      },
-      "name": "string.quoted.single.nsis",
-      "patterns": [
-        {
-          "match": "\\$\\\\.",
-          "name": "constant.character.escape.nsis"
-        }
-      ]
+      }
     },
     {
+      "name": "comment.line.nsis",
+      "match": "(;|#).*$\\n?",
       "captures": {
         "1": {
           "name": "punctuation.definition.comment.nsis"
         }
-      },
-      "match": "(;|#).*$\\n?",
-      "name": "comment.line.nsis"
+      }
     },
     {
+      "name": "comment.block.nsis",
       "begin": "/\\*",
+      "end": "\\*/",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.nsis"
         }
-      },
-      "end": "\\*/",
-      "name": "comment.block.nsis"
+      }
     },
     {
+      "match": "(\\!include|\\!insertmacro)\\b",
       "captures": {
         "match": {
           "name": "keyword.control.import.nsis"
         }
-      },
-      "match": "(\\!include|\\!insertmacro)\\b"
+      }
     }
-  ],
-  "scopeName": "source.nsis",
-  "uuid": "B6872F8A-D31D-11E0-9572-0800200C9A66"
-}
+  ]
+}

data/grammars/source.nu.json

@@ -1,24 +1,18 @@
 {
-  "comment": "\n            This is a bundle for the Nu programming language (www.programming.nu)\n        ",
-  "fileTypes": [
-    "nu",
-    "Nukefile"
-  ],
-  "firstLineMatch": "^#!/.*\\bnush\\b",
-  "foldingStartMarker": "\\(",
-  "foldingStopMarker": "\\)",
-  "keyEquivalent": "^~N",
   "name": "Nu",
+  "scopeName": "source.nu",
   "patterns": [
     {
-      "match": "\\b(t|nil|self|super|YES|NO|margs)\\b",
-      "name": "constant.language.nu"
+      "name": "constant.language.nu",
+      "match": "\\b(t|nil|self|super|YES|NO|margs)\\b"
     },
     {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|-?(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b",
-      "name": "constant.numeric.nu"
+      "name": "constant.numeric.nu",
+      "match": "\\b((0(x|X)[0-9a-fA-F]*)|-?(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b"
     },
     {
+      "name": "constant.character.nu",
+      "match": "(')(.|\\\\[nrfbaes]|\\\\[0-7]{3}|\\\\x[0-9A-Fa-f]{2}|\\\\u[0-9A-Fa-f]{4})(')",
       "captures": {
         "1": {
           "name": "punctuation.definition.constant.nu"
@@ -26,33 +20,33 @@
         "4": {
           "name": "punctuation.definition.constant.nu"
         }
-      },
-      "match": "(')(.|\\\\[nrfbaes]|\\\\[0-7]{3}|\\\\x[0-9A-Fa-f]{2}|\\\\u[0-9A-Fa-f]{4})(')",
-      "name": "constant.character.nu"
+      }
     },
     {
+      "name": "variable.other.readwrite.instance.nu",
+      "match": "(@)[a-zA-Z_]\\w*",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.nu"
         }
-      },
-      "match": "(@)[a-zA-Z_]\\w*",
-      "name": "variable.other.readwrite.instance.nu"
+      }
     },
     {
+      "name": "variable.other.readwrite.global.nu",
+      "match": "(\\$)[a-zA-Z_]\\w*",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.nu"
         }
-      },
-      "match": "(\\$)[a-zA-Z_]\\w*",
-      "name": "variable.other.readwrite.global.nu"
+      }
     },
     {
-      "match": "\\b[A-Z]\\w*\\b",
-      "name": "support.class.nu"
+      "name": "support.class.nu",
+      "match": "\\b[A-Z]\\w*\\b"
     },
     {
+      "name": "comment.nudoc.nu",
+      "match": "(;.*|#.*)(@(abstract|copyright|discussion|file|header|info).*)",
       "captures": {
         "1": {
           "name": "punctuation.definition.comment.nudoc.nu"
@@ -60,62 +54,50 @@
         "2": {
           "name": "support.comment.nudoc.nu"
         }
-      },
-      "match": "(;.*|#.*)(@(abstract|copyright|discussion|file|header|info).*)",
-      "name": "comment.nudoc.nu"
+      }
     },
     {
+      "name": "comment.line.semicolon.nu",
+      "match": "(;).*$\\n?",
       "captures": {
         "1": {
           "name": "punctuation.definition.comment.nu"
         }
-      },
-      "match": "(;).*$\\n?",
-      "name": "comment.line.semicolon.nu"
+      }
     },
     {
+      "name": "comment.line.hash.nu",
+      "match": "(#).*$\\n?",
       "captures": {
         "1": {
           "name": "punctuation.definition.comment.nu"
         }
-      },
-      "match": "(#).*$\\n?",
-      "name": "comment.line.hash.nu"
+      }
     },
     {
+      "name": "string.quoted.double.unescaped.nu",
       "begin": "-\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.nu"
-        }
-      },
       "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.nu"
-        }
-      },
-      "name": "string.quoted.double.unescaped.nu",
       "patterns": [
         {
           "include": "#interpolated_nu"
         }
-      ]
-    },
-    {
-      "begin": "\\+?\"",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.nu"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.nu"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.double.escaped.nu",
+      "begin": "\\+?\"",
+      "end": "\"",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -123,22 +105,22 @@
         {
           "include": "#interpolated_nu"
         }
-      ]
-    },
-    {
-      "begin": "<<[+](.*)",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.nu"
         }
       },
-      "end": "\\1",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.nu"
         }
-      },
+      }
+    },
+    {
       "name": "string.unquoted.heredoc.escaped.nu",
+      "begin": "\u003c\u003c[+](.*)",
+      "end": "\\1",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -146,50 +128,62 @@
         {
           "include": "#interpolated_nu"
         }
-      ]
-    },
-    {
-      "begin": "<<[-](.*)",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.nu"
         }
       },
-      "end": "\\1",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.nu"
         }
-      },
+      }
+    },
+    {
       "name": "string.unquoted.heredoc.unescaped.nu",
+      "begin": "\u003c\u003c[-](.*)",
+      "end": "\\1",
       "patterns": [
         {
           "include": "#interpolated_nu"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.nu"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.nu"
+        }
+      }
     },
     {
+      "name": "string.regexp.nu",
       "begin": "(/)(?=[^ ])",
+      "end": "/[isxlm]*",
+      "patterns": [
+        {
+          "name": "constant.character.escape.nu",
+          "match": "\\\\/"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.regex.begin.nu"
         }
       },
-      "end": "/[isxlm]*",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.regex.end.nu"
         }
-      },
-      "name": "string.regexp.nu",
-      "patterns": [
-        {
-          "match": "\\\\/",
-          "name": "constant.character.escape.nu"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.class.nu",
+      "match": "\\b(class)\\s+((\\w|\\-|\\!|\\?)*)(\\s+(is)\\s+((\\w|\\-|\\!|\\?)*))?",
       "captures": {
         "1": {
           "name": "keyword.control.class.nu"
@@ -203,11 +197,11 @@
         "6": {
           "name": "entity.name.function.nu"
         }
-      },
-      "match": "\\b(class)\\s+((\\w|\\-|\\!|\\?)*)(\\s+(is)\\s+((\\w|\\-|\\!|\\?)*))?",
-      "name": "meta.class.nu"
+      }
     },
     {
+      "name": "meta.protocol.nu",
+      "match": "\\b(protocol)\\s+((\\w)*)",
       "captures": {
         "1": {
           "name": "keyword.control.protocol.nu"
@@ -215,11 +209,11 @@
         "2": {
           "name": "entity.name.function.nu"
         }
-      },
-      "match": "\\b(protocol)\\s+((\\w)*)",
-      "name": "meta.protocol.nu"
+      }
     },
     {
+      "name": "meta.import.nu",
+      "match": "\\((import)\\s+(\\w*)",
       "captures": {
         "1": {
           "name": "keyword.control.import.nu"
@@ -227,11 +221,11 @@
         "2": {
           "name": "entity.name.type.class.nu"
         }
-      },
-      "match": "\\((import)\\s+(\\w*)",
-      "name": "meta.import.nu"
+      }
     },
     {
+      "name": "meta.global.nu",
+      "match": "\\((global)\\s+([\\w\\-]*)",
       "captures": {
         "1": {
           "name": "keyword.control.global.nu"
@@ -239,11 +233,11 @@
         "2": {
           "name": "variable.other.readwrite.global.nu"
         }
-      },
-      "match": "\\((global)\\s+([\\w\\-]*)",
-      "name": "meta.global.nu"
+      }
     },
     {
+      "name": "meta.method.nu.zero-args",
+      "match": "\\(([+-]|[ic]method)\\s+\\((\\w+)\\)\\s+(\\w+)\\s+(is)",
       "captures": {
         "1": {
           "name": "keyword.control.method.nu"
@@ -257,11 +251,11 @@
         "4": {
           "name": "keyword.control.is.nu"
         }
-      },
-      "match": "\\(([+-]|[ic]method)\\s+\\((\\w+)\\)\\s+(\\w+)\\s+(is)",
-      "name": "meta.method.nu.zero-args"
+      }
     },
     {
+      "name": "meta.method.nu.one-arg",
+      "match": "\\(([+-]|[ic]method)\\s+\\((\\w+)\\)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(is)",
       "captures": {
         "1": {
           "name": "keyword.control.method.nu"
@@ -281,11 +275,11 @@
         "6": {
           "name": "keyword.control.is.nu"
         }
-      },
-      "match": "\\(([+-]|[ic]method)\\s+\\((\\w+)\\)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(is)",
-      "name": "meta.method.nu.one-arg"
+      }
     },
     {
+      "name": "meta.method.nu.two-args",
+      "match": "\\(([+-]|[ic]method)\\s+\\((\\w+)\\)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(is)",
       "captures": {
         "1": {
           "name": "keyword.control.method.nu"
@@ -314,11 +308,11 @@
         "9": {
           "name": "keyword.control.is.nu"
         }
-      },
-      "match": "\\(([+-]|[ic]method)\\s+\\((\\w+)\\)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(is)",
-      "name": "meta.method.nu.two-args"
+      }
     },
     {
+      "name": "meta.method.nu.three-args",
+      "match": "\\(([+-]|[ic]method)\\s+\\((\\w+)\\)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(is)",
       "captures": {
         "1": {
           "name": "keyword.control.method.nu"
@@ -356,11 +350,11 @@
         "9": {
           "name": "entity.name.function.nu"
         }
-      },
-      "match": "\\(([+-]|[ic]method)\\s+\\((\\w+)\\)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(\\w+\\:)\\s*\\((\\w+)\\)\\s+(\\w+)\\s+(is)",
-      "name": "meta.method.nu.three-args"
+      }
     },
     {
+      "name": "meta.ivars.nu",
+      "match": "\\b((ivar)\\s+((\\w|\\-|\\!|\\?)*)(\\s+(is)\\s+((\\w|\\-|\\!|\\?)*))?|ivars|ivar-accessors)",
       "captures": {
         "1": {
           "name": "keyword.control.class.nu"
@@ -374,11 +368,11 @@
         "6": {
           "name": "entity.name.function.nu"
         }
-      },
-      "match": "\\b((ivar)\\s+((\\w|\\-|\\!|\\?)*)(\\s+(is)\\s+((\\w|\\-|\\!|\\?)*))?|ivars|ivar-accessors)",
-      "name": "meta.ivars.nu"
+      }
     },
     {
+      "name": "meta.function.nu",
+      "match": "\\b(function|macro|macro-0|macro-1)\\s+((\\w|\\-|\\!|\\?)*)",
       "captures": {
         "1": {
           "name": "keyword.control.function-type.nu"
@@ -386,11 +380,11 @@
         "2": {
           "name": "entity.name.function.nu"
         }
-      },
-      "match": "\\b(function|macro|macro-0|macro-1)\\s+((\\w|\\-|\\!|\\?)*)",
-      "name": "meta.function.nu"
+      }
     },
     {
+      "name": "meta.nukefile.task.nu",
+      "match": "(task)\\s+(\\\"\\w+\")\\s?(:?)\\s?(\\\"[\\w\\s]+\\\")?\\s+(is)",
       "captures": {
         "1": {
           "name": "keyword.control.task.nu"
@@ -407,11 +401,11 @@
         "5": {
           "name": "keyword.control.is.nu"
         }
-      },
-      "match": "(task)\\s+(\\\"\\w+\")\\s?(:?)\\s?(\\\"[\\w\\s]+\\\")?\\s+(is)",
-      "name": "meta.nukefile.task.nu"
+      }
     },
     {
+      "name": "meta.nukefile.task.with-dependencies.nu",
+      "match": "(task)\\s+(\\\"\\w+\\\")\\s?(:)?\\s?(\\\"[\\w\\s]+\\\")?\\s?(=\u003e?)\\s?(\\\"[\\\"\\w\\s]+\\\")?\\s+(is)",
       "captures": {
         "1": {
           "name": "keyword.control.task.nu"
@@ -434,11 +428,11 @@
         "7": {
           "name": "keyword.control.is.nu"
         }
-      },
-      "match": "(task)\\s+(\\\"\\w+\\\")\\s?(:)?\\s?(\\\"[\\w\\s]+\\\")?\\s?(=>?)\\s?(\\\"[\\\"\\w\\s]+\\\")?\\s+(is)",
-      "name": "meta.nukefile.task.with-dependencies.nu"
+      }
     },
     {
+      "name": "meta.nukefile.default.task.nu",
+      "match": "(task)\\s+(\\\"default\\\")\\s+(=\u003e)\\s+(\\\"\\w+\\\")",
       "captures": {
         "1": {
           "name": "keyword.control.task.nu"
@@ -455,43 +449,43 @@
         "5": {
           "name": "keyword.control.is.nu"
         }
-      },
-      "match": "(task)\\s+(\\\"default\\\")\\s+(=>)\\s+(\\\"\\w+\\\")",
-      "name": "meta.nukefile.default.task.nu"
+      }
     },
     {
-      "match": "\\b(let|set|cond|case|do|loop|until|while|for|break|continue|if|else|elseif|then|unless|try|throw|catch|array|dict|list|return)\\b",
-      "name": "keyword.control.nu"
+      "name": "keyword.control.nu",
+      "match": "\\b(let|set|cond|case|do|loop|until|while|for|break|continue|if|else|elseif|then|unless|try|throw|catch|array|dict|list|return)\\b"
     },
     {
-      "match": "\\b(eq|neq|and|or|synchronized|not)\\b",
-      "name": "keyword.operator.nu"
+      "name": "keyword.operator.nu",
+      "match": "\\b(eq|neq|and|or|synchronized|not)\\b"
     },
     {
-      "match": "[/*+-/&|><=!`@]",
-      "name": "keyword.operator.symbolic.nu"
+      "name": "keyword.operator.symbolic.nu",
+      "match": "[/*+-/\u0026|\u003e\u003c=!`@]"
     },
     {
-      "match": "\\b(append|atom|cons|car|cdr|context|eval|head|quote|parse|progn|send|tail|load|system|puts|help|version|beep|first|rest|macrox|print)\\b",
-      "name": "support.function.nu"
+      "name": "support.function.nu",
+      "match": "\\b(append|atom|cons|car|cdr|context|eval|head|quote|parse|progn|send|tail|load|system|puts|help|version|beep|first|rest|macrox|print)\\b"
     },
     {
-      "match": "\\b(assert_equal|assert_not_equal|assert_throws|assert_in_delta|assert_true|assert_false|assert_less_than|assert_greater_than)\\b",
-      "name": "support.function.testing.nu"
+      "name": "support.function.testing.nu",
+      "match": "\\b(assert_equal|assert_not_equal|assert_throws|assert_in_delta|assert_true|assert_false|assert_less_than|assert_greater_than)\\b"
     },
     {
-      "match": "\\b(task|application-tasks|bundle-tasks|compilation-tasks|dylib-tasks|framework-tasks|library-tasks)\\b",
-      "name": "keyword.nukefile.nu"
+      "name": "keyword.nukefile.nu",
+      "match": "\\b(task|application-tasks|bundle-tasks|compilation-tasks|dylib-tasks|framework-tasks|library-tasks)\\b"
     }
   ],
   "repository": {
     "escaped_char": {
-      "match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|.)",
-      "name": "constant.character.escape.nu"
+      "name": "constant.character.escape.nu",
+      "match": "\\\\([0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|.)"
     },
     "interpolated_nu": {
       "patterns": [
         {
+          "name": "source.nu.embedded.source",
+          "match": "#\\{(\\})",
           "captures": {
             "0": {
               "name": "punctuation.section.embedded.nu"
@@ -499,28 +493,24 @@
             "1": {
               "name": "source.nu.embedded.source.empty"
             }
-          },
-          "match": "#\\{(\\})",
-          "name": "source.nu.embedded.source"
+          }
         },
         {
+          "name": "source.nu.embedded.source",
           "begin": "#\\{",
-          "captures": {
-            "0": {
-              "name": "punctuation.section.embedded.nu"
-            }
-          },
           "end": "\\}",
-          "name": "source.nu.embedded.source",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.section.embedded.nu"
+            }
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.nu",
-  "uuid": "F8A96494-C89A-4CA4-A2D3-6A5A4ED56FD7"
-}
+  }
+}