abl-tmlanguage 1.3.14 → 1.3.15

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+1.3.15
+======
+
+- 🐛 Fix include paths with more than one \. (vscode-abl/vscode-abl#362)
+
 1.3.14
 ======
 

package/abl.tmLanguage.json

@@ -3695,7 +3695,7 @@
     "include-file": {
       "name": "meta.include.abl",
       "comment": "https://docs.progress.com/bundle/abl-reference/page/Include-file-reference.html. Filesystem names can be unicode",
-      "begin": "({)\\s*(['\"]?([\\\\\\/\\w$\\-]+)(\\.[\\w]+['\"]?)?)",
+      "begin": "({)\\s*(['\"]?([\\\\\\/\\w$\\-\\.]+)(\\.\\w+['\"]?)?)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.section.abl"
@@ -5826,4 +5826,4 @@
   },
   "scopeName": "source.abl",
   "uuid": "075bb86e-03ea-4fea-bac0-e11b9dc73e03"
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abl-tmlanguage",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "description": "TextMate grammar for Progress OpenEdge ABL Language",
   "main": "",
   "type": "commonjs",

package/spec/include/include-file-name.spec.js

@@ -222,3 +222,17 @@ describe('', () => {
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 
+describe('UNC path, FQDN, and multiple dots in the filename', () => {
+  // see: https://github.com/vscode-abl/vscode-abl/issues/362
+  let statement = `{\\\\fileserver.corp.company.com\\shared\\data\\config.backup.2024.07.29.i &DEBUG=TRUE}`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "meta.include.abl", "punctuation.section.abl"] },  // '{'
+    { "startIndex": 1, "endIndex": 69, "scopes": ["source.abl", "meta.include.abl", "entity.name.include.abl"] },  // '\\fileserver.corp.company.com\shared\data\config.backup.2024.07.29.i'
+    { "startIndex": 69, "endIndex": 70, "scopes": ["source.abl", "meta.include.abl"] },  // ' '
+    { "startIndex": 70, "endIndex": 76, "scopes": ["source.abl", "meta.include.abl", "meta.include.argument.abl", "support.other.argument.abl"] },  // '&DEBUG'
+    { "startIndex": 76, "endIndex": 77, "scopes": ["source.abl", "meta.include.abl", "meta.include.argument.abl", "keyword.operator.source.abl"] },  // '='
+    { "startIndex": 77, "endIndex": 81, "scopes": ["source.abl", "meta.include.abl", "support.other.argument.abl"] },  // 'TRUE'
+    { "startIndex": 81, "endIndex": 82, "scopes": ["source.abl", "meta.include.abl", "punctuation.section.abl"] }  // '}'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+});