@noldova/context.parsers.typescript 0.0.7 → 0.0.9
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.
- package/api/index.d.ts +2 -1
- package/extensions/diagnostic-collector.extensions.js +2 -12
- package/extensions/diagnostic-collector.extensions.js.map +1 -1
- package/extensions/nodes/declarations/typescript-binding-element.node.extensions.js +1 -1
- package/extensions/nodes/declarations/typescript-binding-element.node.extensions.js.map +1 -1
- package/extensions/nodes/declarations/typescript-export-assignment.node.extensions.js +3 -2
- package/extensions/nodes/declarations/typescript-export-assignment.node.extensions.js.map +1 -1
- package/extensions/nodes/declarations/typescript-import-declaration.node.extensions.js +3 -2
- package/extensions/nodes/declarations/typescript-import-declaration.node.extensions.js.map +1 -1
- package/extensions/nodes/declarations/typescript-parameter-list.node.extensions.js +1 -2
- package/extensions/nodes/declarations/typescript-parameter-list.node.extensions.js.map +1 -1
- package/extensions/nodes/delimiters/typescript-at.node.extensions.js +1 -1
- package/extensions/nodes/delimiters/typescript-at.node.extensions.js.map +1 -1
- package/extensions/nodes/statements/typescript-block.node.extensions.js +1 -1
- package/extensions/nodes/statements/typescript-block.node.extensions.js.map +1 -1
- package/extensions/nodes/statements/typescript-for-in-or-of-statement.node.extensions.js +4 -4
- package/extensions/nodes/statements/typescript-for-in-or-of-statement.node.extensions.js.map +1 -1
- package/extensions/nodes/types/typescript-expression-with-type-arguments.node.extensions.js +4 -0
- package/extensions/nodes/types/typescript-expression-with-type-arguments.node.extensions.js.map +1 -1
- package/extensions/nodes/typescript-delimited-list.node.extensions.js +1 -1
- package/extensions/nodes/typescript-delimited-list.node.extensions.js.map +1 -1
- package/models/typescript-arrow-function-parts.js +30 -0
- package/models/typescript-arrow-function-parts.js.map +1 -0
- package/models/typescript-deferred-records.js +4 -4
- package/models/typescript-deferred-records.js.map +1 -1
- package/models/typescript-function-parts.js +38 -0
- package/models/typescript-function-parts.js.map +1 -0
- package/models/typescript-modifier-list.js +16 -0
- package/models/typescript-modifier-list.js.map +1 -0
- package/models/typescript-parameter-list-read.js +16 -0
- package/models/typescript-parameter-list-read.js.map +1 -0
- package/models/typescript-parser-context.js +18 -17
- package/models/typescript-parser-context.js.map +1 -1
- package/models/typescript-region-set.js +9 -11
- package/models/typescript-region-set.js.map +1 -1
- package/models/typescript-spelling-distance-row.js +21 -0
- package/models/typescript-spelling-distance-row.js.map +1 -0
- package/package.json +9 -8
- package/resources.js +2 -0
- package/resources.js.map +1 -1
- package/services/keyword-spelling-suggester.js +16 -18
- package/services/keyword-spelling-suggester.js.map +1 -1
- package/services/lexers/trivia.lexer.js +6 -4
- package/services/lexers/trivia.lexer.js.map +1 -1
- package/services/parsers/class.parser.js +12 -17
- package/services/parsers/class.parser.js.map +1 -1
- package/services/parsers/clauses/switch-clause.parser.js +2 -2
- package/services/parsers/clauses/switch-clause.parser.js.map +1 -1
- package/services/parsers/declarations/class-body.parser.js +2 -2
- package/services/parsers/declarations/class-body.parser.js.map +1 -1
- package/services/parsers/declarations/class-member.parser.js +7 -6
- package/services/parsers/declarations/class-member.parser.js.map +1 -1
- package/services/parsers/declarations/declaration.parser.js +3 -2
- package/services/parsers/declarations/declaration.parser.js.map +1 -1
- package/services/parsers/declarations/enum-declaration.parser.js +2 -2
- package/services/parsers/declarations/enum-declaration.parser.js.map +1 -1
- package/services/parsers/declarations/heritage-clause.parser.js +4 -4
- package/services/parsers/declarations/heritage-clause.parser.js.map +1 -1
- package/services/parsers/declarations/import-attributes.parser.js +11 -12
- package/services/parsers/declarations/import-attributes.parser.js.map +1 -1
- package/services/parsers/declarations/import-clause.parser.js +14 -8
- package/services/parsers/declarations/import-clause.parser.js.map +1 -1
- package/services/parsers/declarations/import-export-specifier.parser.js +13 -14
- package/services/parsers/declarations/import-export-specifier.parser.js.map +1 -1
- package/services/parsers/declarations/index-signature.parser.js.map +1 -1
- package/services/parsers/declarations/modifier.parser.js +11 -3
- package/services/parsers/declarations/modifier.parser.js.map +1 -1
- package/services/parsers/declarations/named-bindings.parser.js +7 -9
- package/services/parsers/declarations/named-bindings.parser.js.map +1 -1
- package/services/parsers/declarations/parameter-list.parser.js +51 -22
- package/services/parsers/declarations/parameter-list.parser.js.map +1 -1
- package/services/parsers/declarations/variable-declaration-list.parser.js +2 -2
- package/services/parsers/declarations/variable-declaration-list.parser.js.map +1 -1
- package/services/parsers/expressions/argument-list.parser.js +2 -2
- package/services/parsers/expressions/argument-list.parser.js.map +1 -1
- package/services/parsers/expressions/array-literal-expression.parser.js +2 -2
- package/services/parsers/expressions/array-literal-expression.parser.js.map +1 -1
- package/services/parsers/expressions/arrow-function.parser.js +69 -38
- package/services/parsers/expressions/arrow-function.parser.js.map +1 -1
- package/services/parsers/expressions/assignment-expression.parser.js +3 -2
- package/services/parsers/expressions/assignment-expression.parser.js.map +1 -1
- package/services/parsers/expressions/object-literal-expression.parser.js +2 -2
- package/services/parsers/expressions/object-literal-expression.parser.js.map +1 -1
- package/services/parsers/expressions/parenthesized-expression.parser.js +6 -7
- package/services/parsers/expressions/parenthesized-expression.parser.js.map +1 -1
- package/services/parsers/function.parser.js +6 -7
- package/services/parsers/function.parser.js.map +1 -1
- package/services/parsers/names/binding-name.parser.js +4 -4
- package/services/parsers/names/binding-name.parser.js.map +1 -1
- package/services/parsers/source.parser.js +18 -29
- package/services/parsers/source.parser.js.map +1 -1
- package/services/parsers/statements/block.parser.js +2 -2
- package/services/parsers/statements/block.parser.js.map +1 -1
- package/services/parsers/statements/for-statement.parser.js +2 -2
- package/services/parsers/statements/for-statement.parser.js.map +1 -1
- package/services/parsers/statements/switch-statement.parser.js +2 -2
- package/services/parsers/statements/switch-statement.parser.js.map +1 -1
- package/services/parsers/statements/try-statement.parser.js +4 -1
- package/services/parsers/statements/try-statement.parser.js.map +1 -1
- package/services/parsers/types/tuple-type.parser.js +2 -2
- package/services/parsers/types/tuple-type.parser.js.map +1 -1
- package/services/parsers/types/type-argument-list.parser.js +19 -11
- package/services/parsers/types/type-argument-list.parser.js.map +1 -1
- package/services/parsers/types/type-literal.parser.js +4 -2
- package/services/parsers/types/type-literal.parser.js.map +1 -1
- package/services/parsers/types/type-member.parser.js +2 -2
- package/services/parsers/types/type-member.parser.js.map +1 -1
- package/services/parsers/types/type-parameter-list.parser.js +2 -2
- package/services/parsers/types/type-parameter-list.parser.js.map +1 -1
- package/services/parsers/types/type.parser.js +1 -2
- package/services/parsers/types/type.parser.js.map +1 -1
- package/services/typescript-diagnostic-locator.js +18 -0
- package/services/typescript-diagnostic-locator.js.map +1 -0
- package/services/typescript-region-splicer.js +54 -0
- package/services/typescript-region-splicer.js.map +1 -0
- package/services/typescript-syntax.parser.js +5 -6
- package/services/typescript-syntax.parser.js.map +1 -1
- package/services/typescript.parser.js +13 -4
- package/services/typescript.parser.js.map +1 -1
|
@@ -17,6 +17,7 @@ import { TypeScriptAsyncKeywordNode } from "../../models/nodes/keywords/typescri
|
|
|
17
17
|
import { TypeScriptDefaultKeywordNode } from "../../models/nodes/keywords/typescript-default-keyword.node.js";
|
|
18
18
|
import { TypeScriptFunctionKeywordNode } from "../../models/nodes/keywords/typescript-function-keyword.node.js";
|
|
19
19
|
import { TypeScriptAsteriskNode } from "../../models/nodes/operators/typescript-asterisk.node.js";
|
|
20
|
+
import { TypeScriptFunctionParts } from "../../models/typescript-function-parts.js";
|
|
20
21
|
import { ParameterListParser } from "./declarations/parameter-list.parser.js";
|
|
21
22
|
import { IdentifierNameParser } from "./names/identifier-name.parser.js";
|
|
22
23
|
import { BlockParser } from "./statements/block.parser.js";
|
|
@@ -35,13 +36,13 @@ export class FunctionParser {
|
|
|
35
36
|
this.typeParameterListParser = new TypeParameterListParser(typescriptParser);
|
|
36
37
|
}
|
|
37
38
|
parseDeclaration(modifierNodes = []) {
|
|
38
|
-
return this.parse(true, modifierNodes);
|
|
39
|
+
return this.parse(true, modifierNodes, parts => new TypeScriptFunctionDeclarationNode(parts.functionKeywordNode, parts.span, parts.parameterListNode, parts.modifierNodes, parts.asteriskNode, parts.nameNode, parts.typeParameterListNode, parts.colonNode, parts.returnTypeNode, parts.bodyNode, parts.semicolonNode, parts.leadingTrivia, parts.trailingTrivia));
|
|
39
40
|
}
|
|
40
41
|
parseExpression() {
|
|
41
42
|
const asyncKeywordNode = this.typescriptParser.tryConsume(TypeScriptAsyncKeywordNode);
|
|
42
|
-
return this.parse(false, Object.isUndefined(asyncKeywordNode) ? [] : [asyncKeywordNode]);
|
|
43
|
+
return this.parse(false, Object.isUndefined(asyncKeywordNode) ? [] : [asyncKeywordNode], parts => new TypeScriptFunctionExpressionNode(parts.functionKeywordNode, parts.span, parts.parameterListNode, parts.modifierNodes, parts.asteriskNode, parts.nameNode, parts.typeParameterListNode, parts.colonNode, parts.returnTypeNode, parts.bodyNode, parts.leadingTrivia, parts.trailingTrivia));
|
|
43
44
|
}
|
|
44
|
-
parse(isDeclaration, modifierNodes) {
|
|
45
|
+
parse(isDeclaration, modifierNodes, create) {
|
|
45
46
|
const parser = this.typescriptParser;
|
|
46
47
|
const startNode = modifierNodes[0] ?? parser.currentNode;
|
|
47
48
|
const functionKeywordNode = parser.requireCurrentNode(TypeScriptFunctionKeywordNode);
|
|
@@ -61,7 +62,7 @@ export class FunctionParser {
|
|
|
61
62
|
parser.context.isFunctionScope = previousFunctionScope;
|
|
62
63
|
const signatureDiagnosticCount = parser.context.diagnosticCollector.diagnostics.length;
|
|
63
64
|
const typeParameterListNode = this.typeParameterListParser.parse(TypeScriptTypeParameterAnnotations.Const);
|
|
64
|
-
const parameterListNode = this.parameterListParser.parseFunctionParameters(flags,
|
|
65
|
+
const parameterListNode = this.parameterListParser.parseFunctionParameters(flags, true);
|
|
65
66
|
this.parameterListParser.validate(parameterListNode, typeParameterListNode);
|
|
66
67
|
const hasSignatureDiagnostics = parser.context.diagnosticCollector.diagnostics.length !== signatureDiagnosticCount;
|
|
67
68
|
const colonNode = parser.tryConsume(TypeScriptColonNode);
|
|
@@ -80,9 +81,7 @@ export class FunctionParser {
|
|
|
80
81
|
const semicolonNode = hasTerminator ? parser.parseStatementTerminator() : undefined;
|
|
81
82
|
const endNode = bodyNode ?? semicolonNode ?? returnTypeNode ?? colonNode ?? parameterListNode;
|
|
82
83
|
const span = parser.typescriptLexer.reader.createSpan(startNode.span, endNode.span);
|
|
83
|
-
const resultNode =
|
|
84
|
-
? new TypeScriptFunctionDeclarationNode(functionKeywordNode, span, parameterListNode, modifierNodes, asteriskNode, nameNode, typeParameterListNode, colonNode, returnTypeNode, bodyNode, semicolonNode, startNode.leadingTrivia, endNode.trailingTrivia)
|
|
85
|
-
: new TypeScriptFunctionExpressionNode(functionKeywordNode, span, parameterListNode, modifierNodes, asteriskNode, nameNode, typeParameterListNode, colonNode, returnTypeNode, bodyNode, startNode.leadingTrivia, endNode.trailingTrivia);
|
|
84
|
+
const resultNode = create(new TypeScriptFunctionParts(functionKeywordNode, span, parameterListNode, modifierNodes, asteriskNode, nameNode, typeParameterListNode, colonNode, returnTypeNode, bodyNode, semicolonNode, startNode.leadingTrivia, endNode.trailingTrivia));
|
|
86
85
|
parameterListNode.readTypeScriptHolder(parser.context, resultNode);
|
|
87
86
|
parser.reportWrittenAwaits(writtenAwaitCount, bodyNode, resultNode, false, modifierNodes.some(t => t instanceof TypeScriptAsyncKeywordNode));
|
|
88
87
|
return resultNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function.parser.js","sourceRoot":"","sources":["../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/function.parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,kCAAkC,EAAE,MAAM,sDAAsD,CAAC;AAC1G,OAAO,EAAE,6BAA6B,EAAE,MAAM,6DAA6D,CAAC;AAC5G,OAAO,EAAE,iCAAiC,EAAE,MAAM,yEAAyE,CAAC;AAC5H,OAAO,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAC7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,6DAA6D,CAAC;AACtG,OAAO,EAAE,gCAAgC,EAAE,MAAM,uEAAuE,CAAC;AACzH,OAAO,EAAE,+BAA+B,EAAE,MAAM,sEAAsE,CAAC;AACvH,OAAO,EAAE,0BAA0B,EAAE,MAAM,8DAA8D,CAAC;AAC1G,OAAO,EAAE,4BAA4B,EAAE,MAAM,gEAAgE,CAAC;AAC9G,OAAO,EAAE,6BAA6B,EAAE,MAAM,iEAAiE,CAAC;AAChH,OAAO,EAAE,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;
|
|
1
|
+
{"version":3,"file":"function.parser.js","sourceRoot":"","sources":["../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/function.parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,7 @@ export class BindingNameParser {
|
|
|
68
68
|
const context = this.typescriptParser.context;
|
|
69
69
|
const previousFlags = context.contextFlags;
|
|
70
70
|
context.contextFlags &= ~TypeScriptContextFlags.DisallowIn;
|
|
71
|
-
context.enterList(TypeScriptListKind.ArrayBindingElements);
|
|
71
|
+
const outerListScope = context.enterList(TypeScriptListKind.ArrayBindingElements);
|
|
72
72
|
try {
|
|
73
73
|
this.typescriptParser.advance();
|
|
74
74
|
const elementNodes = [];
|
|
@@ -115,7 +115,7 @@ export class BindingNameParser {
|
|
|
115
115
|
return patternNode;
|
|
116
116
|
}
|
|
117
117
|
finally {
|
|
118
|
-
context.leaveList();
|
|
118
|
+
context.leaveList(outerListScope);
|
|
119
119
|
context.contextFlags = previousFlags;
|
|
120
120
|
}
|
|
121
121
|
}
|
|
@@ -123,7 +123,7 @@ export class BindingNameParser {
|
|
|
123
123
|
const context = this.typescriptParser.context;
|
|
124
124
|
const previousFlags = context.contextFlags;
|
|
125
125
|
context.contextFlags &= ~TypeScriptContextFlags.DisallowIn;
|
|
126
|
-
context.enterList(TypeScriptListKind.ObjectBindingElements);
|
|
126
|
+
const outerListScope = context.enterList(TypeScriptListKind.ObjectBindingElements);
|
|
127
127
|
try {
|
|
128
128
|
this.typescriptParser.advance();
|
|
129
129
|
const elementNodes = [];
|
|
@@ -163,7 +163,7 @@ export class BindingNameParser {
|
|
|
163
163
|
return patternNode;
|
|
164
164
|
}
|
|
165
165
|
finally {
|
|
166
|
-
context.leaveList();
|
|
166
|
+
context.leaveList(outerListScope);
|
|
167
167
|
context.contextFlags = previousFlags;
|
|
168
168
|
}
|
|
169
169
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binding-name.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/names/binding-name.parser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"binding-name.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/names/binding-name.parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,8 @@ import { TypeScriptRegionSet } from "../../models/typescript-region-set.js";
|
|
|
19
19
|
import { TypeScriptReparsedRegion } from "../../models/typescript-reparsed-region.js";
|
|
20
20
|
import { Resources } from "../../resources.js";
|
|
21
21
|
import { TypeScriptLexer } from "../lexers/typescript.lexer.js";
|
|
22
|
+
import { TypeScriptDiagnosticLocator } from "../typescript-diagnostic-locator.js";
|
|
23
|
+
import { TypeScriptRegionSplicer } from "../typescript-region-splicer.js";
|
|
22
24
|
import { TypeScriptSyntaxParser } from "../typescript-syntax.parser.js";
|
|
23
25
|
import { SourceDirectiveParser } from "./trivia/source-directive.parser.js";
|
|
24
26
|
export class SourceParser {
|
|
@@ -46,34 +48,20 @@ export class SourceParser {
|
|
|
46
48
|
return rootNode;
|
|
47
49
|
}
|
|
48
50
|
const originalDiagnostics = [...context.diagnosticCollector.diagnostics];
|
|
49
|
-
const statements = [];
|
|
50
51
|
const regions = [];
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
const
|
|
56
|
-
while (statementIndex < rootNode.children.length && rootNode.children[statementIndex].span.endOffset <= range.startOffset)
|
|
57
|
-
statements.push(rootNode.children[statementIndex++]);
|
|
58
|
-
const region = this.reparseRegion(ranges, rangeIndex);
|
|
52
|
+
let regionEndOffset = 0;
|
|
53
|
+
for (const [rangeIndex, range] of ranges.entries()) {
|
|
54
|
+
if (range.startOffset < regionEndOffset)
|
|
55
|
+
continue;
|
|
56
|
+
const region = this.reparseRegion(range, ranges, rangeIndex + 1);
|
|
59
57
|
regions.push(region);
|
|
60
|
-
|
|
61
|
-
statements.push(statement);
|
|
62
|
-
while (statementIndex < rootNode.children.length && rootNode.children[statementIndex].span.startOffset < region.span.endOffset)
|
|
63
|
-
statementIndex++;
|
|
64
|
-
const followingStatement = rootNode.children[statementIndex];
|
|
65
|
-
const followingOffset = followingStatement?.leadingTrivia?.span.startOffset ?? followingStatement?.span.startOffset ?? rootNode.span.endOffset;
|
|
66
|
-
replacedDiagnosticSpans.push(new SourceSpan(range.startOffset, followingOffset - range.startOffset));
|
|
67
|
-
do
|
|
68
|
-
rangeIndex++;
|
|
69
|
-
while (rangeIndex < ranges.length && ranges[rangeIndex].startOffset < region.span.endOffset);
|
|
58
|
+
regionEndOffset = region.span.endOffset;
|
|
70
59
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
const replacedDiagnosticRegions = new TypeScriptRegionSet(replacedDiagnosticSpans);
|
|
60
|
+
const statements = TypeScriptRegionSplicer.spliceStatements(rootNode.children, regions);
|
|
61
|
+
const replacedDiagnosticRegions = new TypeScriptRegionSet(TypeScriptRegionSplicer.measureReplacedSpans(rootNode.children, regions, rootNode.span.endOffset));
|
|
74
62
|
context.diagnosticCollector.truncate(0);
|
|
75
63
|
for (const diagnostic of originalDiagnostics)
|
|
76
|
-
if (!replacedDiagnosticRegions.contains(diagnostic.
|
|
64
|
+
if (!replacedDiagnosticRegions.contains(TypeScriptDiagnosticLocator.locate(diagnostic).start))
|
|
77
65
|
context.diagnosticCollector.add(diagnostic);
|
|
78
66
|
for (const region of regions)
|
|
79
67
|
for (const diagnostic of region.diagnostics)
|
|
@@ -161,7 +149,7 @@ export class SourceParser {
|
|
|
161
149
|
const statements = [];
|
|
162
150
|
let statementStartNode = parser.currentNode;
|
|
163
151
|
let isInterrupted = false;
|
|
164
|
-
context.enterList(TypeScriptListKind.SourceElements);
|
|
152
|
+
const outerListScope = context.enterList(TypeScriptListKind.SourceElements);
|
|
165
153
|
try {
|
|
166
154
|
while (!parser.isEndOfFile) {
|
|
167
155
|
statementStartNode = parser.currentNode;
|
|
@@ -192,19 +180,20 @@ export class SourceParser {
|
|
|
192
180
|
isInterrupted = true;
|
|
193
181
|
}
|
|
194
182
|
finally {
|
|
195
|
-
context.leaveList();
|
|
183
|
+
context.leaveList(outerListScope);
|
|
196
184
|
}
|
|
197
185
|
const endOfFileNode = parser.currentNode;
|
|
198
186
|
const span = parser.typescriptLexer.reader.createSpan(this.startOffset, endOfFileNode.span.endOffset - this.startOffset);
|
|
199
187
|
const trailingTrivia = isInterrupted || statements.length === 0 ? undefined : endOfFileNode.leadingTrivia;
|
|
200
188
|
return new TypeScriptNode(statements, span, this.leadingTrivia, trailingTrivia);
|
|
201
189
|
}
|
|
202
|
-
reparseRegion(ranges,
|
|
190
|
+
reparseRegion(range, ranges, followingIndex) {
|
|
203
191
|
const originalContext = this.typescriptParser.context;
|
|
204
192
|
const reader = this.typescriptParser.typescriptLexer.reader;
|
|
205
193
|
const savedOffset = reader.currentOffset;
|
|
206
|
-
const startOffset =
|
|
207
|
-
let endOffset =
|
|
194
|
+
const startOffset = range.startOffset;
|
|
195
|
+
let endOffset = range.endOffset;
|
|
196
|
+
let nextRangeIndex = followingIndex;
|
|
208
197
|
const context = new TypeScriptParserContext(reader.source);
|
|
209
198
|
context.contextFlags = originalContext.contextFlags | TypeScriptContextFlags.TopLevelAwait;
|
|
210
199
|
const statements = [];
|
|
@@ -222,7 +211,7 @@ export class SourceParser {
|
|
|
222
211
|
if (nextOffset === endOffset)
|
|
223
212
|
break;
|
|
224
213
|
if (nextOffset > endOffset)
|
|
225
|
-
endOffset = ranges[++
|
|
214
|
+
endOffset = ranges[nextRangeIndex++]?.endOffset ?? reader.endOffset;
|
|
226
215
|
}
|
|
227
216
|
if (parser.isEndOfFile)
|
|
228
217
|
endOffset = reader.endOffset;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source.parser.js","sourceRoot":"","sources":["../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/source.parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"source.parser.js","sourceRoot":"","sources":["../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/source.parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,7 +69,7 @@ export class BlockParser {
|
|
|
69
69
|
const context = this.typescriptParser.context;
|
|
70
70
|
const previousReportedAmbientStatement = context.hasReportedAmbientStatement;
|
|
71
71
|
context.hasReportedAmbientStatement = hasReportedAmbientStatement;
|
|
72
|
-
context.enterList(TypeScriptListKind.BlockStatements);
|
|
72
|
+
const outerListScope = context.enterList(TypeScriptListKind.BlockStatements);
|
|
73
73
|
try {
|
|
74
74
|
const startNode = openBraceNode ?? this.typescriptParser.currentNode;
|
|
75
75
|
const startOffset = startNode.span.startOffset;
|
|
@@ -100,7 +100,7 @@ export class BlockParser {
|
|
|
100
100
|
return new TypeScriptBlockNode(openBraceNode, statements, span, closeBraceNode, startNode.leadingTrivia, trailingTrivia);
|
|
101
101
|
}
|
|
102
102
|
finally {
|
|
103
|
-
context.leaveList();
|
|
103
|
+
context.leaveList(outerListScope);
|
|
104
104
|
context.hasReportedAmbientStatement = previousReportedAmbientStatement;
|
|
105
105
|
}
|
|
106
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/statements/block.parser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"block.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/statements/block.parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,11 +35,11 @@ export class ForStatementParser {
|
|
|
35
35
|
typescriptParser.reportExpected(Resources.openParenthesis);
|
|
36
36
|
const initializerNode = this.parseHeaderInitializer();
|
|
37
37
|
const node = typescriptParser.currentNode;
|
|
38
|
-
if (node instanceof TypeScriptOfKeywordNode)
|
|
38
|
+
if (!Object.isUndefined(initializerNode) && node instanceof TypeScriptOfKeywordNode)
|
|
39
39
|
return this.parseForOf(forKeywordNode, awaitKeywordNode, openParenthesisNode, initializerNode, node);
|
|
40
40
|
if (!Object.isUndefined(awaitKeywordNode))
|
|
41
41
|
typescriptParser.reportExpected(Resources.of);
|
|
42
|
-
if (node instanceof TypeScriptInKeywordNode)
|
|
42
|
+
if (!Object.isUndefined(initializerNode) && node instanceof TypeScriptInKeywordNode)
|
|
43
43
|
return this.parseForIn(forKeywordNode, openParenthesisNode, initializerNode, node);
|
|
44
44
|
return this.parseFor(forKeywordNode, openParenthesisNode, initializerNode);
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"for-statement.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/statements/for-statement.parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,6BAA6B,EAAE,MAAM,gEAAgE,CAAC;AAC/G,OAAO,EAAE,8BAA8B,EAAE,MAAM,uEAAuE,CAAC;AACvH,OAAO,EAAE,6BAA6B,EAAE,MAAM,sEAAsE,CAAC;AACrH,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,0BAA0B,EAAE,MAAM,iEAAiE,CAAC;AAE7G,OAAO,EAAE,uBAAuB,EAAE,MAAM,8DAA8D,CAAC;AACvG,OAAO,EAAE,uBAAuB,EAAE,MAAM,8DAA8D,CAAC;AACvG,OAAO,EAAE,0BAA0B,EAAE,MAAM,iEAAiE,CAAC;AAE7G,OAAO,EAAE,4BAA4B,EAAE,MAAM,sEAAsE,CAAC;AACpH,OAAO,EAAE,4BAA4B,EAAE,MAAM,sEAAsE,CAAC;AACpH,OAAO,EAAE,0BAA0B,EAAE,MAAM,mEAAmE,CAAC;AAC/G,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,6BAA6B,EAAE,MAAM,qDAAqD,CAAC;AAEpG,MAAM,OAAO,kBAAkB;IACZ,gBAAgB,CAAyB;IACzC,6BAA6B,CAAgC;IAE9E,YAAmB,gBAAwC;QACzD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,6BAA6B,GAAG,IAAI,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;IAC3F,CAAC;IAEM,KAAK,CAAC,cAAwC;QACnD,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC/C,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC3B,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC;QACjF,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,UAAU,CAAC,6BAA6B,CAAC,CAAC;QACvF,IAAI,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC;YACzC,gBAAgB,CAAC,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAE7D,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,gBAAgB,CAAC,WAAW,CAAC;QAC1C,IAAI,IAAI,YAAY,uBAAuB;
|
|
1
|
+
{"version":3,"file":"for-statement.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/statements/for-statement.parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ export class SwitchStatementParser {
|
|
|
51
51
|
const previousSubstatement = context.isSubstatement;
|
|
52
52
|
context.isCaseClause = true;
|
|
53
53
|
context.isSubstatement = false;
|
|
54
|
-
context.enterList(TypeScriptListKind.SwitchClauses);
|
|
54
|
+
const outerListScope = context.enterList(TypeScriptListKind.SwitchClauses);
|
|
55
55
|
try {
|
|
56
56
|
const parser = this.typescriptParser;
|
|
57
57
|
const startNode = parser.currentNode;
|
|
@@ -83,7 +83,7 @@ export class SwitchStatementParser {
|
|
|
83
83
|
return new TypeScriptCaseBlockNode(clauses, span, openBraceNode, closeBraceNode, Object.isUndefined(endNode) ? undefined : startNode.leadingTrivia, endNode?.trailingTrivia);
|
|
84
84
|
}
|
|
85
85
|
finally {
|
|
86
|
-
context.leaveList();
|
|
86
|
+
context.leaveList(outerListScope);
|
|
87
87
|
context.isCaseClause = previousCaseClause;
|
|
88
88
|
context.isSubstatement = previousSubstatement;
|
|
89
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switch-statement.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/statements/switch-statement.parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,6BAA6B,EAAE,MAAM,gEAAgE,CAAC;AAG/G,OAAO,EAAE,wBAAwB,EAAE,MAAM,iEAAiE,CAAC;AAC3G,OAAO,EAAE,8BAA8B,EAAE,MAAM,uEAAuE,CAAC;AACvH,OAAO,EAAE,uBAAuB,EAAE,MAAM,gEAAgE,CAAC;AACzG,OAAO,EAAE,6BAA6B,EAAE,MAAM,sEAAsE,CAAC;AAErH,OAAO,EAAE,uBAAuB,EAAE,MAAM,gEAAgE,CAAC;AACzG,OAAO,EAAE,6BAA6B,EAAE,MAAM,sEAAsE,CAAC;AACrH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,MAAM,OAAO,qBAAqB;IACf,gBAAgB,CAAyB;IAE1D,YAAmB,gBAAwC;QACzD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;IAEM,KAAK,CAAC,iBAA8C;QACzD,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,mBAAmB,GAAG,MAAM,CAAC,UAAU,CAAC,6BAA6B,CAAC,CAAC;QAC7E,IAAI,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC;YACzC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACnD,MAAM,cAAc,GAAG,MAAM,CAAC,yBAAyB,EAAE,CAAC;QAC1D,MAAM,oBAAoB,GAAG,MAAM,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC;QAC/E,IAAI,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC1C,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACpD,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAC7C,MAAM,UAAU,GAAG,IAAI,6BAA6B,CAAC,iBAAiB,EAAE,cAAc,EAAE,aAAa,EACnG,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,EACpF,mBAAmB,EAAE,oBAAoB,EAAE,iBAAiB,CAAC,aAAa,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;QAE5G,UAAU,CAAC,yBAAyB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrD,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,eAAe;QACrB,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;QAC9C,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;QAC/B,CAAC;gBACO,CAAC;YACP,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAEO,cAAc;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;QAC9C,MAAM,kBAAkB,GAAG,OAAO,CAAC,YAAY,CAAC;QAChD,MAAM,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;QACpD,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;QAC5B,OAAO,CAAC,cAAc,GAAG,KAAK,CAAC;QAC/B,OAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"switch-statement.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/statements/switch-statement.parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,13 +30,16 @@ export class TryStatementParser {
|
|
|
30
30
|
const catchClauseNode = catchKeywordNode instanceof TypeScriptCatchKeywordNode ? this.catchClauseParser.parse(catchKeywordNode) : undefined;
|
|
31
31
|
let finallyKeywordNode;
|
|
32
32
|
let finallyBlockNode;
|
|
33
|
+
let endNode;
|
|
33
34
|
if (Object.isUndefined(catchClauseNode) || parser.currentNode instanceof TypeScriptFinallyKeywordNode) {
|
|
34
35
|
finallyKeywordNode = parser.tryConsume(TypeScriptFinallyKeywordNode);
|
|
35
36
|
if (Object.isUndefined(finallyKeywordNode))
|
|
36
37
|
parser.context.diagnosticCollector.addTypeScriptParseDiagnostic(TypeScriptDiagnosticTemplates.TS1472, parser.currentNode.span);
|
|
37
38
|
finallyBlockNode = parser.parseRequiredBlock();
|
|
39
|
+
endNode = finallyBlockNode;
|
|
38
40
|
}
|
|
39
|
-
|
|
41
|
+
else
|
|
42
|
+
endNode = catchClauseNode;
|
|
40
43
|
return new TypeScriptTryStatementNode(tryKeywordNode, parser.typescriptLexer.reader.createSpan(startNode.span, endNode.span), tryBlockNode, catchClauseNode, finallyKeywordNode, finallyBlockNode, startNode.leadingTrivia, endNode.trailingTrivia);
|
|
41
44
|
}
|
|
42
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"try-statement.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/statements/try-statement.parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,6BAA6B,EAAE,MAAM,gEAAgE,CAAC;AAC/G,OAAO,EAAE,0BAA0B,EAAE,MAAM,iEAAiE,CAAC;AAC7G,OAAO,EAAE,4BAA4B,EAAE,MAAM,mEAAmE,CAAC;AAGjH,OAAO,EAAE,0BAA0B,EAAE,MAAM,mEAAmE,CAAC;AAC/G,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,MAAM,OAAO,kBAAkB;IACZ,gBAAgB,CAAyB;IACzC,iBAAiB,CAAoB;IAEtD,YAAmB,gBAAwC;QACzD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IACnE,CAAC;IAEM,KAAK,CAAC,cAAyC;QACpD,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,IAAI,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC;YACpC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;;YAErC,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,YAAY,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,cAAc,IAAI,YAAY,CAAC;QACjD,MAAM,gBAAgB,GAAG,MAAM,CAAC,WAAW,CAAC;QAC5C,MAAM,eAAe,GAAG,gBAAgB,YAAY,0BAA0B,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5I,IAAI,kBAA4D,CAAC;QACjE,IAAI,gBAAiD,CAAC;QACtD,IAAI,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,MAAM,CAAC,WAAW,YAAY,4BAA4B,EAAE,CAAC;YACtG,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAC;YACrE,IAAI,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC;gBACxC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,6BAA6B,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACjI,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"try-statement.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/statements/try-statement.parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,6BAA6B,EAAE,MAAM,gEAAgE,CAAC;AAC/G,OAAO,EAAE,0BAA0B,EAAE,MAAM,iEAAiE,CAAC;AAC7G,OAAO,EAAE,4BAA4B,EAAE,MAAM,mEAAmE,CAAC;AAGjH,OAAO,EAAE,0BAA0B,EAAE,MAAM,mEAAmE,CAAC;AAC/G,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,MAAM,OAAO,kBAAkB;IACZ,gBAAgB,CAAyB;IACzC,iBAAiB,CAAoB;IAEtD,YAAmB,gBAAwC;QACzD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IACnE,CAAC;IAEM,KAAK,CAAC,cAAyC;QACpD,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,IAAI,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC;YACpC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;;YAErC,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,YAAY,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,cAAc,IAAI,YAAY,CAAC;QACjD,MAAM,gBAAgB,GAAG,MAAM,CAAC,WAAW,CAAC;QAC5C,MAAM,eAAe,GAAG,gBAAgB,YAAY,0BAA0B,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5I,IAAI,kBAA4D,CAAC;QACjE,IAAI,gBAAiD,CAAC;QACtD,IAAI,OAAa,CAAC;QAClB,IAAI,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,MAAM,CAAC,WAAW,YAAY,4BAA4B,EAAE,CAAC;YACtG,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAC;YACrE,IAAI,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC;gBACxC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,6BAA6B,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACjI,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAC/C,OAAO,GAAG,gBAAgB,CAAC;QAC7B,CAAC;;YAEC,OAAO,GAAG,eAAe,CAAC;QAC5B,OAAO,IAAI,0BAA0B,CAAC,cAAc,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAC1H,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1H,CAAC;CACF"}
|
|
@@ -24,7 +24,7 @@ export class TupleTypeParser {
|
|
|
24
24
|
this.typescriptParser = typescriptParser;
|
|
25
25
|
}
|
|
26
26
|
parse(openBracketNode) {
|
|
27
|
-
this.typescriptParser.context.enterList(TypeScriptListKind.TupleElementTypes);
|
|
27
|
+
const outerListScope = this.typescriptParser.context.enterList(TypeScriptListKind.TupleElementTypes);
|
|
28
28
|
try {
|
|
29
29
|
const typescriptParser = this.typescriptParser;
|
|
30
30
|
typescriptParser.advance();
|
|
@@ -67,7 +67,7 @@ export class TupleTypeParser {
|
|
|
67
67
|
return new TypeScriptTupleTypeNode(openBracketNode, elementNodes, commaNodes, span, closeBracketNode, openBracketNode.leadingTrivia, endNode.trailingTrivia);
|
|
68
68
|
}
|
|
69
69
|
finally {
|
|
70
|
-
this.typescriptParser.context.leaveList();
|
|
70
|
+
this.typescriptParser.context.leaveList(outerListScope);
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
parseElement() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tuple-type.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/types/tuple-type.parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,6BAA6B,EAAE,MAAM,gEAAgE,CAAC;AAC/G,OAAO,EAAE,0BAA0B,EAAE,MAAM,mEAAmE,CAAC;AAC/G,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAC;AAChG,OAAO,EAAE,uBAAuB,EAAE,MAAM,iEAAiE,CAAC;AAE1G,OAAO,EAAE,sBAAsB,EAAE,MAAM,6DAA6D,CAAC;AACrG,OAAO,EAAE,8BAA8B,EAAE,MAAM,mEAAmE,CAAC;AACnH,OAAO,EAAE,0BAA0B,EAAE,MAAM,8DAA8D,CAAC;AAC1G,OAAO,EAAE,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAClG,OAAO,EAAE,uBAAuB,EAAE,MAAM,2DAA2D,CAAC;AACpG,OAAO,EAAE,0BAA0B,EAAE,MAAM,8DAA8D,CAAC;AAC1G,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,MAAM,OAAO,eAAe;IACT,gBAAgB,CAAyB;IAE1D,YAAmB,gBAAwC;QACzD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;IAEM,KAAK,CAAC,eAA0C;QACrD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tuple-type.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/types/tuple-type.parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,6BAA6B,EAAE,MAAM,gEAAgE,CAAC;AAC/G,OAAO,EAAE,0BAA0B,EAAE,MAAM,mEAAmE,CAAC;AAC/G,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAC;AAChG,OAAO,EAAE,uBAAuB,EAAE,MAAM,iEAAiE,CAAC;AAE1G,OAAO,EAAE,sBAAsB,EAAE,MAAM,6DAA6D,CAAC;AACrG,OAAO,EAAE,8BAA8B,EAAE,MAAM,mEAAmE,CAAC;AACnH,OAAO,EAAE,0BAA0B,EAAE,MAAM,8DAA8D,CAAC;AAC1G,OAAO,EAAE,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAClG,OAAO,EAAE,uBAAuB,EAAE,MAAM,2DAA2D,CAAC;AACpG,OAAO,EAAE,0BAA0B,EAAE,MAAM,8DAA8D,CAAC;AAC1G,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,MAAM,OAAO,eAAe;IACT,gBAAgB,CAAyB;IAE1D,YAAmB,gBAAwC;QACzD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;IAEM,KAAK,CAAC,eAA0C;QACrD,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;QACrG,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;YAC/C,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC3B,MAAM,YAAY,GAAW,EAAE,CAAC;YAChC,MAAM,UAAU,GAA0B,EAAE,CAAC;YAC7C,IAAI,OAAO,GAAS,eAAe,CAAC;YAEpC,OAAO,CAAC,gBAAgB,CAAC,WAAW,IAAI,CAAC,CAAC,gBAAgB,CAAC,WAAW,YAAY,0BAA0B,CAAC,EAAE,CAAC;gBAC9G,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC;gBAC/C,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,EAAE,CAAC;oBAC/F,gBAAgB,CAAC,OAAO,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,6BAA6B,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;oBAChI,IAAI,gBAAgB,CAAC,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC;wBAC3D,MAAM;oBACR,OAAO,GAAG,SAAS,CAAC;oBACpB,gBAAgB,CAAC,OAAO,EAAE,CAAC;oBAC3B,SAAS;gBACX,CAAC;gBACD,IAAI,gBAAgB,CAAC,WAAW,YAAY,mBAAmB;oBAC7D,gBAAgB,CAAC,OAAO,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,6BAA6B,CAAC,MAAM,EAAE,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;qBAChJ,CAAC;oBACJ,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;oBACxC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBAC/B,OAAO,GAAG,WAAW,CAAC;gBACxB,CAAC;gBAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;gBACnE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;oBACnC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC3B,OAAO,GAAG,SAAS,CAAC;oBACpB,SAAS;gBACX,CAAC;gBACD,IAAI,gBAAgB,CAAC,WAAW,IAAI,gBAAgB,CAAC,WAAW,YAAY,0BAA0B;oBACpG,MAAM;gBACR,gBAAgB,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACnD,CAAC;YAED,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC;YACjF,IAAI,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC;gBACtC,gBAAgB,CAAC,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;;gBAExD,OAAO,GAAG,gBAAgB,CAAC;YAE7B,MAAM,IAAI,GAAG,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YAEpG,OAAO,IAAI,uBAAuB,CAChC,eAAe,EACf,YAAY,EACZ,UAAU,EACV,IAAI,EACJ,gBAAgB,EAChB,eAAe,CAAC,aAAa,EAC7B,OAAO,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC;gBACO,CAAC;YACP,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAEO,YAAY;QAClB,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC5B,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACjC,CAAC;IAEO,gBAAgB;QACtB,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC/C,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;QACnD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YACnG,OAAO,IAAI,sBAAsB,CAAC,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,CAAC,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;QACzH,CAAC;QAED,IAAI,QAAQ,YAAY,0BAA0B,IAAI,QAAQ,CAAC,YAAY,YAAY,sBAAsB;eACxG,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,KAAK,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW;YAC7G,OAAO,IAAI,0BAA0B,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;QAClJ,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,mBAAmB;QACzB,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC/C,OAAO,gBAAgB,CAAC,SAAS,CAAC,GAAG,EAAE;YACrC,gBAAgB,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;YACrD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,CAAC;YAC9C,IAAI,CAAC,QAAQ,CAAC,6BAA6B,EAAE;gBAC3C,OAAO,KAAK,CAAC;YAEf,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC3B,gBAAgB,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC;YACpD,OAAO,gBAAgB,CAAC,WAAW,YAAY,mBAAmB,CAAC;QACrE,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,iBAAiB;QACvB,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC/C,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC;QAC/C,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,CAAC;QAC9C,gBAAgB,CAAC,WAAW,EAAE,CAAC;QAC/B,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;QAE3E,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE/F,OAAO,IAAI,8BAA8B,CACvC,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,aAAa,EACb,YAAY,EACZ,SAAS,CAAC,aAAa,EACvB,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC7B,CAAC;CACF"}
|
|
@@ -32,9 +32,14 @@ export class TypeArgumentListParser {
|
|
|
32
32
|
return typescriptParser.tryParse(() => {
|
|
33
33
|
if (typescriptParser.currentNode instanceof TypeScriptShiftLeftNode)
|
|
34
34
|
typescriptParser.reLexLessThan();
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
35
|
+
const lessThanNode = typescriptParser.requireCurrentNode(TypeScriptLessThanNode);
|
|
36
|
+
const argumentNodes = [];
|
|
37
|
+
const commaNodes = [];
|
|
38
|
+
const endNode = this.parseArguments(lessThanNode, argumentNodes, commaNodes);
|
|
39
|
+
if (!typescriptParser.currentNode.isTypeScriptSingleGreaterThan(typescriptParser))
|
|
40
|
+
return undefined;
|
|
41
|
+
const node = this.close(lessThanNode, argumentNodes, commaNodes, endNode);
|
|
42
|
+
if (Object.isUndefined(node.greaterThanNode) || !typescriptParser.currentNode.canFollowTypeScriptTypeArguments(typescriptParser))
|
|
38
43
|
return undefined;
|
|
39
44
|
if (!(calleeNode instanceof TypeScriptImportKeywordNode))
|
|
40
45
|
node.validateTypeScriptGrammar(typescriptParser.context);
|
|
@@ -45,7 +50,9 @@ export class TypeArgumentListParser {
|
|
|
45
50
|
const lessThanNode = this.typescriptParser.currentNode;
|
|
46
51
|
if (!(lessThanNode instanceof TypeScriptLessThanNode))
|
|
47
52
|
return undefined;
|
|
48
|
-
const
|
|
53
|
+
const argumentNodes = [];
|
|
54
|
+
const commaNodes = [];
|
|
55
|
+
const resultNode = this.close(lessThanNode, argumentNodes, commaNodes, this.parseArguments(lessThanNode, argumentNodes, commaNodes));
|
|
49
56
|
resultNode.validateTypeScriptGrammar(this.typescriptParser.context);
|
|
50
57
|
return resultNode;
|
|
51
58
|
}
|
|
@@ -54,13 +61,11 @@ export class TypeArgumentListParser {
|
|
|
54
61
|
this.typescriptParser.reLexLessThan();
|
|
55
62
|
return this.parse();
|
|
56
63
|
}
|
|
57
|
-
parseArguments(lessThanNode,
|
|
64
|
+
parseArguments(lessThanNode, argumentNodes, commaNodes) {
|
|
58
65
|
const typescriptParser = this.typescriptParser;
|
|
59
66
|
typescriptParser.advance();
|
|
60
|
-
const argumentNodes = [];
|
|
61
|
-
const commaNodes = [];
|
|
62
67
|
let endNode = lessThanNode;
|
|
63
|
-
typescriptParser.context.enterList(TypeScriptListKind.TypeArguments);
|
|
68
|
+
const outerListScope = typescriptParser.context.enterList(TypeScriptListKind.TypeArguments);
|
|
64
69
|
try {
|
|
65
70
|
while (typescriptParser.currentNode.isTypeScriptListElement(TypeScriptListKind.TypeArguments, typescriptParser)) {
|
|
66
71
|
const argumentNode = typescriptParser.parseType();
|
|
@@ -74,10 +79,13 @@ export class TypeArgumentListParser {
|
|
|
74
79
|
}
|
|
75
80
|
}
|
|
76
81
|
finally {
|
|
77
|
-
typescriptParser.context.leaveList();
|
|
82
|
+
typescriptParser.context.leaveList(outerListScope);
|
|
78
83
|
}
|
|
79
|
-
|
|
80
|
-
|
|
84
|
+
return endNode;
|
|
85
|
+
}
|
|
86
|
+
close(lessThanNode, argumentNodes, commaNodes, argumentsEndNode) {
|
|
87
|
+
const typescriptParser = this.typescriptParser;
|
|
88
|
+
let endNode = argumentsEndNode;
|
|
81
89
|
const greaterThanNode = typescriptParser.tryConsume(TypeScriptGreaterThanNode);
|
|
82
90
|
if (Object.isUndefined(greaterThanNode))
|
|
83
91
|
typescriptParser.reportExpected(Resources.greaterThan);
|