abl-tmlanguage 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/abl.tmLanguage.json +29 -44
  2. package/package.json +3 -4
  3. package/spec/define-parameter/simple-single-line.spec.js +29 -1
package/abl.tmLanguage.json CHANGED
@@ -180,7 +180,7 @@
180
180
  {
181
181
  "begin": "(?i)\\b(new|shared|var|vari|varia|variab|variabl|variable|private|protected|public|static|serializable|non-serializable)\\b",
182
182
  "end": "(?=\\.)",
183
- "comment": "https://documentation.progress.com/output/ua/OpenEdge_latest/index.html#page/dvref%2Fdefine-variable-statement.html%23",
183
+ "comment": "https://docs.progress.com/bundle/openedge-abl-reference-122/page/DEFINE-VARIABLE-statement.html",
184
184
  "name": "meta.define.variable.abl",
185
185
  "beginCaptures": {
186
186
  "1": {
@@ -209,40 +209,39 @@
209
209
  ]
210
210
  },
211
211
  {
212
- "match": "(?i)(?<=^|\\s)(input|output|input-output|return)(?=\\s)([^\\.]*)",
213
- "comment": "https://documentation.progress.com/output/ua/OpenEdge_latest/index.html#page/dvref%2Fdefine-variable-statement.html%23",
212
+ "begin": "(?i)\\b(?<![\\w-])(input|output|input-output|return)(?![\\w-])\\b",
213
+ "end": "(?=\\.)",
214
+ "comment": "https://docs.progress.com/bundle/openedge-abl-reference-122/page/DEFINE-PARAMETER-statement.html",
214
215
  "name": "meta.define.parameter.abl",
215
- "captures": {
216
+ "beginCaptures": {
216
217
  "1": {
217
218
  "name": "keyword.other.abl"
219
+ }
220
+ },
221
+ "patterns": [
222
+ {
223
+ "include": "#string"
218
224
  },
219
- "2": {
220
- "patterns": [
221
- {
222
- "include": "#string"
223
- },
224
- {
225
- "include": "#primitive-type"
226
- },
227
- {
228
- "include": "#numeric"
229
- },
230
- {
231
- "include": "#constant"
232
- },
233
- {
234
- "include": "#keywords"
235
- },
236
- {
237
- "include": "#parameter-name"
238
- }
239
- ]
225
+ {
226
+ "include": "#primitive-type"
227
+ },
228
+ {
229
+ "include": "#numeric"
230
+ },
231
+ {
232
+ "include": "#constant"
233
+ },
234
+ {
235
+ "include": "#keywords"
236
+ },
237
+ {
238
+ "include": "#parameter-name"
240
239
  }
241
- }
240
+ ]
242
241
  },
243
242
  {
244
243
  "match": "(?i)\\b(stream)\\b([^\\.]*)",
245
- "comment": "https://documentation.progress.com/output/ua/OpenEdge_latest/index.html#page/dvref%2Fdefine-stream-statement.html%23",
244
+ "comment": "https://docs.progress.com/bundle/openedge-abl-reference-122/page/DEFINE-STREAM-statement.html",
246
245
  "name": "meta.define.stream.abl",
247
246
  "captures": {
248
247
  "1": {
@@ -460,10 +459,10 @@
460
459
  }
461
460
  }
462
461
  ],
463
- "comment": "https://documentation.progress.com/output/ua/OpenEdge_latest/index.html#page/dvref%2F%257B-%257D-include-file-reference.html%23"
462
+ "comment": "https://docs.progress.com/bundle/openedge-abl-reference-122/page/Include-file-reference.html"
464
463
  },
465
464
  "argument-reference": {
466
- "comment": "https://documentation.progress.com/output/ua/OpenEdge_latest/index.html#page/dvref%2F%257B-%257D-argument-reference.html%23"
465
+ "comment": "https://docs.progress.com/bundle/openedge-abl-reference-122/page/Argument-reference.html"
467
466
  },
468
467
  "singlelinecomment": {
469
468
  "match": "//.*$",
@@ -536,7 +535,7 @@
536
535
  "primitive-type": {
537
536
  "match": "(?i)(?<=^|\\s)(blob|character|characte|charact|charac|chara|char|clob|com-handle|date|datetime|datetime-tz|decimal|decima|decim|deci|dec|handle|int64|integer|intege|integ|inte|int|logical|logica|logic|logi|log|longchar|longcha|longch|memptr|raw|recid|rowid|widget-handle)(?![=\\w-])",
538
537
  "name": "storage.type.abl",
539
- "comment": "https://documentation.progress.com/output/ua/OpenEdge_latest/index.html#page/dvref/data-types.html"
538
+ "comment": "https://docs.progress.com/bundle/openedge-abl-reference-122/page/Data-types.html"
540
539
  },
541
540
  "numeric": {
542
541
  "match": "(?<![\\w-])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))",
@@ -555,20 +554,6 @@
555
554
  "match": "\\."
556
555
  },
557
556
  "operator": {
558
- "patterns": [
559
- {
560
- "include": "#operator1"
561
- },
562
- {
563
- "include": "#operator2"
564
- }
565
- ]
566
- },
567
- "operator1": {
568
- "match": "(?i)(?<=^|\\s)(or|and|not|is|eq|ge|ne|le|lt|gt)(?=\\s|\\.)",
569
- "name": "keyword.operator.source.abl"
570
- },
571
- "operator2": {
572
557
  "match": "(?i)(<=|<>|>=|=|\\+| - |/|<|>|,)",
573
558
  "name": "keyword.operator.source.abl"
574
559
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "abl-tmlanguage",
3
- "version": "1.1.2",
3
+ "version": "1.1.3",
4
4
  "description": "Textmate grammar for Progress OpenEdge ABL Language",
5
5
  "main": "",
6
6
  "repository": {
@@ -21,9 +21,8 @@
21
21
  },
22
22
  "devDependencies": {
23
23
  "chai": "^4.2.0",
24
- "mocha": "^6.2.3",
24
+ "mocha": "^10.2.0",
25
25
  "vscode-textmate": "^7.0.1",
26
26
  "vscode-oniguruma": "^1.6.2"
27
- },
28
- "dependencies": {}
27
+ }
29
28
  }
package/spec/define-parameter/simple-single-line.spec.js CHANGED
@@ -83,6 +83,34 @@ describe('', () => {
83
83
  {"startIndex":38,"endIndex":47,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","storage.type.abl"]},
84
84
  {"startIndex":47,"endIndex":48,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl"]},
85
85
  {"startIndex":48,"endIndex":55,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","keyword.other.abl"]},
86
- {"startIndex":55,"endIndex":56,"scopes":["source.abl","punctuation.terminator.abl"]}];
86
+ {"startIndex":55,"endIndex":56,"scopes":["source.abl","punctuation.terminator.abl"]}
87
+ ];
88
+ shared.itShouldMatchExpectedScopes(statement, expectedTokens);
89
+ })
90
+
91
+ describe('', () => {
92
+ let statement = `define input parameter vdec as decimal format ">>>.99" no-undo.`;
93
+ let expectedTokens = [
94
+ {"startIndex":0,"endIndex":6,"scopes":["source.abl","meta.define.abl","keyword.other.abl"]},
95
+ {"startIndex":6,"endIndex":7,"scopes":["source.abl","meta.define.abl"]},
96
+ {"startIndex":7,"endIndex":12,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","keyword.other.abl"]},
97
+ {"startIndex":12,"endIndex":13,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl"]},
98
+ {"startIndex":13,"endIndex":22,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","keyword.other.abl"]},
99
+ {"startIndex":22,"endIndex":23,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl"]},
100
+ {"startIndex":23,"endIndex":27,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","variable.parameter.abl"]},
101
+ {"startIndex":27,"endIndex":28,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl"]},
102
+ {"startIndex":28,"endIndex":30,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","keyword.other.abl"]},
103
+ {"startIndex":30,"endIndex":31,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl"]},
104
+ {"startIndex":31,"endIndex":38,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","storage.type.abl"]},
105
+ {"startIndex":38,"endIndex":39,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl"]},
106
+ {"startIndex":39,"endIndex":45,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","keyword.other.abl"]},
107
+ {"startIndex":45,"endIndex":46,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl"]},
108
+ {"startIndex":46,"endIndex":47,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","string.double.complex.abl","punctuation.definition.string.begin.abl"]},
109
+ {"startIndex":47,"endIndex":53,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","string.double.complex.abl"]},
110
+ {"startIndex":53,"endIndex":54,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","string.double.complex.abl","punctuation.definition.string.end.abl"]},
111
+ {"startIndex":54,"endIndex":55,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl"]},
112
+ {"startIndex":55,"endIndex":62,"scopes":["source.abl","meta.define.abl","meta.define.parameter.abl","keyword.other.abl"]},
113
+ {"startIndex":62,"endIndex":63,"scopes":["source.abl","punctuation.terminator.abl"]}
114
+ ];
87
115
  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
88
116
  })