@microsoft/powerquery-language-services 0.6.12 → 0.9.2
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/lib/powerquery-language-services/analysis/analysis.d.ts +12 -11
- package/lib/powerquery-language-services/analysis/analysisBase.d.ts +31 -25
- package/lib/powerquery-language-services/analysis/analysisBase.js +210 -169
- package/lib/powerquery-language-services/analysis/analysisBase.js.map +1 -1
- package/lib/powerquery-language-services/analysis/analysisUtils.d.ts +1 -1
- package/lib/powerquery-language-services/analysis/analysisUtils.js +3 -3
- package/lib/powerquery-language-services/analysis/analysisUtils.js.map +1 -1
- package/lib/powerquery-language-services/analysis/memoizedAnalysis.d.ts +6 -6
- package/lib/powerquery-language-services/analysis/memoizedAnalysis.js.map +1 -1
- package/lib/powerquery-language-services/documentSymbols.js +4 -4
- package/lib/powerquery-language-services/documentSymbols.js.map +1 -1
- package/lib/powerquery-language-services/externalType/externalTypeUtils.d.ts +2 -2
- package/lib/powerquery-language-services/externalType/externalTypeUtils.js +5 -5
- package/lib/powerquery-language-services/externalType/externalTypeUtils.js.map +1 -1
- package/lib/powerquery-language-services/index.d.ts +2 -1
- package/lib/powerquery-language-services/index.js +4 -3
- package/lib/powerquery-language-services/index.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.d.ts +5 -6
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.js +3 -4
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js +212 -179
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js +6 -6
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.d.ts +4 -5
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js +10 -20
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.d.ts +2 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js +22 -23
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js +3 -3
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js +5 -5
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js +3 -3
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js +5 -7
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.js +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/commonTypes.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.d.ts +2 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js +14 -14
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.d.ts +5 -3
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js +302 -52
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/commonTypes.d.ts +0 -3
- package/lib/powerquery-language-services/inspection/autocomplete/task.js +3 -3
- package/lib/powerquery-language-services/inspection/autocomplete/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/trailingToken.d.ts +8 -0
- package/lib/powerquery-language-services/inspection/autocomplete/trailingToken.js +5 -0
- package/lib/powerquery-language-services/inspection/autocomplete/trailingToken.js.map +1 -0
- package/lib/powerquery-language-services/inspection/autocomplete/{common.d.ts → trailingTokenUtils.d.ts} +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/trailingTokenUtils.js +19 -0
- package/lib/powerquery-language-services/inspection/autocomplete/trailingTokenUtils.js.map +1 -0
- package/lib/powerquery-language-services/inspection/deferenceIdentifier.js +7 -7
- package/lib/powerquery-language-services/inspection/deferenceIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/expectedType.js +2 -2
- package/lib/powerquery-language-services/inspection/expectedType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js +8 -8
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js +5 -5
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js +5 -5
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js +4 -4
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/task.js +8 -8
- package/lib/powerquery-language-services/inspection/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js +8 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js +2 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js +18 -18
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js +5 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js +2 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js +5 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js +5 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js +7 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js +6 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js +2 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js +5 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js +7 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js +2 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js +2 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js +8 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js +46 -46
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js +5 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/task.js +3 -3
- package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/typeCache/typeCacheUtils.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/typeCache/typeCacheUtils.js +3 -3
- package/lib/powerquery-language-services/inspection/typeCache/typeCacheUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspectionUtils.d.ts +3 -3
- package/lib/powerquery-language-services/inspectionUtils.js +29 -31
- package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/librarySymbolUtils.d.ts +10 -2
- package/lib/powerquery-language-services/library/librarySymbolUtils.js +18 -12
- package/lib/powerquery-language-services/library/librarySymbolUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/libraryUtils.d.ts +5 -5
- package/lib/powerquery-language-services/library/libraryUtils.js +12 -12
- package/lib/powerquery-language-services/library/libraryUtils.js.map +1 -1
- package/lib/powerquery-language-services/positionUtils.d.ts +8 -4
- package/lib/powerquery-language-services/positionUtils.js +40 -13
- package/lib/powerquery-language-services/positionUtils.js.map +1 -1
- package/lib/powerquery-language-services/providers/libraryProvider.js +2 -2
- package/lib/powerquery-language-services/providers/libraryProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js +3 -3
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/partialSemanticToken.js +12 -12
- package/lib/powerquery-language-services/providers/localDocumentProvider/partialSemanticToken.js.map +1 -1
- package/lib/powerquery-language-services/providers/nullSymbolProvider.js +6 -6
- package/lib/powerquery-language-services/providers/nullSymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/tokenPositionComparison.d.ts +5 -0
- package/lib/powerquery-language-services/tokenPositionComparison.js +13 -0
- package/lib/powerquery-language-services/tokenPositionComparison.js.map +1 -0
- package/lib/powerquery-language-services/traceUtils.d.ts +2 -2
- package/lib/powerquery-language-services/traceUtils.js +5 -5
- package/lib/powerquery-language-services/traceUtils.js.map +1 -1
- package/lib/powerquery-language-services/validate/validate.js +4 -4
- package/lib/powerquery-language-services/validate/validate.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js +3 -3
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js +2 -2
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js +2 -2
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js +1 -1
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js.map +1 -1
- package/package.json +9 -7
- package/lib/powerquery-language-services/inspection/autocomplete/common.js +0 -11
- package/lib/powerquery-language-services/inspection/autocomplete/common.js.map +0 -1
|
@@ -15,17 +15,17 @@ function createLibrary(librarySymbols, externalTypeResolverFn) {
|
|
|
15
15
|
libraryDefinitions = libraryDefinitionsResult.value;
|
|
16
16
|
invalidSymbols = [];
|
|
17
17
|
}
|
|
18
|
-
else if (powerquery_parser_1.PartialResultUtils.
|
|
19
|
-
libraryDefinitions = libraryDefinitionsResult.
|
|
20
|
-
invalidSymbols = libraryDefinitionsResult.
|
|
18
|
+
else if (powerquery_parser_1.PartialResultUtils.isIncomplete(libraryDefinitionsResult)) {
|
|
19
|
+
libraryDefinitions = libraryDefinitionsResult.partial.libraryDefinitions;
|
|
20
|
+
invalidSymbols = libraryDefinitionsResult.partial.invalidSymbols;
|
|
21
21
|
}
|
|
22
22
|
else if (powerquery_parser_1.PartialResultUtils.isError(libraryDefinitionsResult)) {
|
|
23
|
-
return powerquery_parser_1.PartialResultUtils.
|
|
23
|
+
return powerquery_parser_1.PartialResultUtils.error(libraryDefinitionsResult.error);
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
26
|
powerquery_parser_1.Assert.isNever(libraryDefinitionsResult);
|
|
27
27
|
}
|
|
28
|
-
const definitionResolverFn = library_1.LibraryUtils.
|
|
28
|
+
const definitionResolverFn = library_1.LibraryUtils.externalTypeResolver(libraryDefinitions);
|
|
29
29
|
const library = {
|
|
30
30
|
libraryDefinitions,
|
|
31
31
|
externalTypeResolver: externalTypeResolverFn
|
|
@@ -33,10 +33,13 @@ function createLibrary(librarySymbols, externalTypeResolverFn) {
|
|
|
33
33
|
: definitionResolverFn,
|
|
34
34
|
};
|
|
35
35
|
if (invalidSymbols.length > 0) {
|
|
36
|
-
return powerquery_parser_1.PartialResultUtils.
|
|
36
|
+
return powerquery_parser_1.PartialResultUtils.incomplete({
|
|
37
|
+
library,
|
|
38
|
+
invalidSymbols,
|
|
39
|
+
});
|
|
37
40
|
}
|
|
38
41
|
else {
|
|
39
|
-
return powerquery_parser_1.PartialResultUtils.
|
|
42
|
+
return powerquery_parser_1.PartialResultUtils.ok(library);
|
|
40
43
|
}
|
|
41
44
|
}
|
|
42
45
|
exports.createLibrary = createLibrary;
|
|
@@ -53,13 +56,16 @@ function createLibraryDefinitions(librarySymbols) {
|
|
|
53
56
|
}
|
|
54
57
|
}
|
|
55
58
|
if (invalidSymbols.length === 0) {
|
|
56
|
-
return powerquery_parser_1.PartialResultUtils.
|
|
59
|
+
return powerquery_parser_1.PartialResultUtils.ok(libraryDefinitions);
|
|
57
60
|
}
|
|
58
61
|
else if (libraryDefinitions.size > 0) {
|
|
59
|
-
return powerquery_parser_1.PartialResultUtils.
|
|
62
|
+
return powerquery_parser_1.PartialResultUtils.incomplete({
|
|
63
|
+
libraryDefinitions,
|
|
64
|
+
invalidSymbols,
|
|
65
|
+
});
|
|
60
66
|
}
|
|
61
67
|
else {
|
|
62
|
-
return powerquery_parser_1.PartialResultUtils.
|
|
68
|
+
return powerquery_parser_1.PartialResultUtils.error(invalidSymbols);
|
|
63
69
|
}
|
|
64
70
|
}
|
|
65
71
|
exports.createLibraryDefinitions = createLibraryDefinitions;
|
|
@@ -129,7 +135,7 @@ function librarySymbolFunctionSignatureToType(librarySymbol, returnType) {
|
|
|
129
135
|
nameLiteral: parameter.name,
|
|
130
136
|
});
|
|
131
137
|
}
|
|
132
|
-
return language_1.TypeUtils.
|
|
138
|
+
return language_1.TypeUtils.definedFunction(false, parameters, returnType);
|
|
133
139
|
}
|
|
134
140
|
function librarySymbolFunctionParameterToLibraryParameter(parameter) {
|
|
135
141
|
var _a;
|
|
@@ -221,7 +227,7 @@ function stringToPrimitiveType(text) {
|
|
|
221
227
|
default:
|
|
222
228
|
return undefined;
|
|
223
229
|
}
|
|
224
|
-
return typeKind ? language_1.TypeUtils.
|
|
230
|
+
return typeKind ? language_1.TypeUtils.primitiveType(isNullable, typeKind) : undefined;
|
|
225
231
|
}
|
|
226
232
|
function stringToTypeKind(text) {
|
|
227
233
|
return language_1.ConstantUtils.isPrimitiveTypeConstant(text)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"librarySymbolUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/library/librarySymbolUtils.ts"],"names":[],"mappings":";;;AAAA,oEAAyF;AACzF,0FAAuH;AACvH,2FAA2G;AAE3G,kDAAkE;AAClE,wCAAmD;AAEnD,gDAAoD;
|
|
1
|
+
{"version":3,"file":"librarySymbolUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/library/librarySymbolUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,12 +8,12 @@ export declare function assertAsType(definition: TLibraryDefinition | undefined)
|
|
|
8
8
|
export declare function assertIsConstant(definition: TLibraryDefinition | undefined): asserts definition is LibraryConstant;
|
|
9
9
|
export declare function assertIsFunction(definition: TLibraryDefinition | undefined): asserts definition is LibraryFunction;
|
|
10
10
|
export declare function assertIsType(definition: TLibraryDefinition | undefined): asserts definition is LibraryType;
|
|
11
|
-
export declare function
|
|
12
|
-
export declare function
|
|
13
|
-
export declare function
|
|
11
|
+
export declare function constantDefinition(label: string, description: string, asType: Type.TPowerQueryType, completionItemKind: CompletionItemKind): LibraryConstant;
|
|
12
|
+
export declare function externalTypeResolver(libraryDefinitions: LibraryDefinitions): ExternalType.TExternalTypeResolverFn;
|
|
13
|
+
export declare function functionDefinition(label: string, description: string, asType: Type.TPowerQueryType, completionItemKind: CompletionItemKind, parameters: ReadonlyArray<LibraryParameter>): LibraryFunction;
|
|
14
14
|
export declare function isConstant(definition: TLibraryDefinition | undefined): definition is LibraryConstant;
|
|
15
15
|
export declare function isFunction(definition: TLibraryDefinition | undefined): definition is LibraryFunction;
|
|
16
16
|
export declare function isType(definition: TLibraryDefinition | undefined): definition is LibraryType;
|
|
17
|
-
export declare function
|
|
18
|
-
export declare function
|
|
17
|
+
export declare function signatureInformation(libraryFunctionSignature: LibraryFunction): SignatureInformation;
|
|
18
|
+
export declare function parameterInformation(libraryParameter: LibraryParameter): ParameterInformation;
|
|
19
19
|
export declare function nameOf(kind: LibraryDefinitionKind): string;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.nameOf = exports.
|
|
5
|
+
exports.nameOf = exports.parameterInformation = exports.signatureInformation = exports.isType = exports.isFunction = exports.isConstant = exports.functionDefinition = exports.externalTypeResolver = exports.constantDefinition = exports.assertIsType = exports.assertIsFunction = exports.assertIsConstant = exports.assertAsType = exports.assertAsFunction = exports.assertAsConstant = void 0;
|
|
6
6
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
7
7
|
function assertAsConstant(definition) {
|
|
8
8
|
assertIsConstant(definition);
|
|
@@ -37,7 +37,7 @@ function assertIsType(definition) {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
exports.assertIsType = assertIsType;
|
|
40
|
-
function
|
|
40
|
+
function constantDefinition(label, description, asType, completionItemKind) {
|
|
41
41
|
return {
|
|
42
42
|
kind: "Constant" /* Constant */,
|
|
43
43
|
asPowerQueryType: asType,
|
|
@@ -46,12 +46,12 @@ function createConstantDefinition(label, description, asType, completionItemKind
|
|
|
46
46
|
label,
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
|
-
exports.
|
|
50
|
-
function
|
|
49
|
+
exports.constantDefinition = constantDefinition;
|
|
50
|
+
function externalTypeResolver(libraryDefinitions) {
|
|
51
51
|
return (request) => { var _a; return (_a = libraryDefinitions.get(request.identifierLiteral)) === null || _a === void 0 ? void 0 : _a.asPowerQueryType; };
|
|
52
52
|
}
|
|
53
|
-
exports.
|
|
54
|
-
function
|
|
53
|
+
exports.externalTypeResolver = externalTypeResolver;
|
|
54
|
+
function functionDefinition(label, description, asType, completionItemKind, parameters) {
|
|
55
55
|
return {
|
|
56
56
|
kind: "Function" /* Function */,
|
|
57
57
|
asPowerQueryType: asType,
|
|
@@ -61,7 +61,7 @@ function createFunctionDefinition(label, description, asType, completionItemKind
|
|
|
61
61
|
parameters,
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
|
-
exports.
|
|
64
|
+
exports.functionDefinition = functionDefinition;
|
|
65
65
|
function isConstant(definition) {
|
|
66
66
|
return (definition === null || definition === void 0 ? void 0 : definition.kind) === "Constant" /* Constant */;
|
|
67
67
|
}
|
|
@@ -74,21 +74,21 @@ function isType(definition) {
|
|
|
74
74
|
return (definition === null || definition === void 0 ? void 0 : definition.kind) === "Type" /* Type */;
|
|
75
75
|
}
|
|
76
76
|
exports.isType = isType;
|
|
77
|
-
function
|
|
77
|
+
function signatureInformation(libraryFunctionSignature) {
|
|
78
78
|
return {
|
|
79
79
|
label: libraryFunctionSignature.label,
|
|
80
80
|
documentation: libraryFunctionSignature.description,
|
|
81
|
-
parameters: libraryFunctionSignature.parameters.map(
|
|
81
|
+
parameters: libraryFunctionSignature.parameters.map(parameterInformation),
|
|
82
82
|
};
|
|
83
83
|
}
|
|
84
|
-
exports.
|
|
85
|
-
function
|
|
84
|
+
exports.signatureInformation = signatureInformation;
|
|
85
|
+
function parameterInformation(libraryParameter) {
|
|
86
86
|
return {
|
|
87
87
|
label: libraryParameter.label,
|
|
88
88
|
documentation: undefined,
|
|
89
89
|
};
|
|
90
90
|
}
|
|
91
|
-
exports.
|
|
91
|
+
exports.parameterInformation = parameterInformation;
|
|
92
92
|
function nameOf(kind) {
|
|
93
93
|
switch (kind) {
|
|
94
94
|
case "Function" /* Function */:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libraryUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/library/libraryUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,oEAAsD;AActD,SAAgB,gBAAgB,CAAC,UAA0C;IACvE,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAE7B,OAAO,UAAU,CAAC;AACtB,CAAC;AAJD,4CAIC;AAED,SAAgB,gBAAgB,CAAC,UAA0C;IACvE,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAE7B,OAAO,UAAU,CAAC;AACtB,CAAC;AAJD,4CAIC;AAED,SAAgB,YAAY,CAAC,UAA0C;IACnE,YAAY,CAAC,UAAU,CAAC,CAAC;IAEzB,OAAO,UAAU,CAAC;AACtB,CAAC;AAJD,oCAIC;AAED,SAAgB,gBAAgB,CAAC,UAA0C;IACvE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,6BAA6B,yBAA8B,EAAE,CAAC,CAAC;KAClF;AACL,CAAC;AAJD,4CAIC;AAED,SAAgB,gBAAgB,CAAC,UAA0C;IACvE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,6BAA6B,yBAA8B,EAAE,CAAC,CAAC;KAClF;AACL,CAAC;AAJD,4CAIC;AAED,SAAgB,YAAY,CAAC,UAA0C;IACnE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,6BAA6B,iBAA0B,EAAE,CAAC,CAAC;KAC9E;AACL,CAAC;AAJD,oCAIC;AAED,SAAgB,
|
|
1
|
+
{"version":3,"file":"libraryUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/library/libraryUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,12 @@ import * as PQP from "@microsoft/powerquery-parser";
|
|
|
2
2
|
import { NodeIdMap, TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
3
|
import type { Position, Range } from "vscode-languageserver-types";
|
|
4
4
|
import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
5
|
-
|
|
6
|
-
export declare function
|
|
7
|
-
export declare function
|
|
8
|
-
export declare function
|
|
5
|
+
import { TokenPositionComparison } from "./tokenPositionComparison";
|
|
6
|
+
export declare function compareTokenPosition(position: Position, tokenPosition: PQP.Language.Token.TokenPosition): TokenPositionComparison;
|
|
7
|
+
export declare function positionFromTokenPosition(tokenPosition: PQP.Language.Token.TokenPosition): Position;
|
|
8
|
+
export declare function rangeFromXorNode(nodeIdMapCollection: NodeIdMap.Collection, xorNode: TXorNode): Promise<Range | undefined>;
|
|
9
|
+
export declare function rangeFromTokenPositions(startTokenPosition: PQP.Language.Token.TokenPosition | undefined, endTokenPosition: PQP.Language.Token.TokenPosition | undefined): Range | undefined;
|
|
10
|
+
export declare function rangeFromTokenRange(tokenRange: PQP.Language.Token.TokenRange): Range;
|
|
9
11
|
export declare function isBeforeXor(position: Position, xorNode: TXorNode, isBoundIncluded: boolean): boolean;
|
|
10
12
|
export declare function isInXor(nodeIdMapCollection: NodeIdMap.Collection, position: Position, xorNode: TXorNode, isLowerBoundIncluded: boolean, isUpperBoundIncluded: boolean): boolean;
|
|
11
13
|
export declare function isOnXorStart(position: Position, xorNode: TXorNode): boolean;
|
|
@@ -21,6 +23,8 @@ export declare function isInAst(position: Position, astNode: Ast.TNode, isLowerB
|
|
|
21
23
|
export declare function isOnAstStart(position: Position, astNode: Ast.TNode): boolean;
|
|
22
24
|
export declare function isOnAstEnd(position: Position, astNode: Ast.TNode): boolean;
|
|
23
25
|
export declare function isAfterAst(position: Position, astNode: Ast.TNode, isBoundIncluded: boolean): boolean;
|
|
26
|
+
export declare function isOnTokenStart(position: Position, token: PQP.Language.Token.Token): boolean;
|
|
27
|
+
export declare function isOnTokenEnd(position: Position, token: PQP.Language.Token.Token): boolean;
|
|
24
28
|
export declare function isInToken(position: Position, token: PQP.Language.Token.Token, isLowerBoundIncluded: boolean, isHigherBoundIncluded: boolean): boolean;
|
|
25
29
|
export declare function isBeforeTokenPosition(position: Position, tokenPosition: PQP.Language.Token.TokenPosition, isBoundIncluded: boolean): boolean;
|
|
26
30
|
export declare function isOnTokenPosition(position: Position, tokenPosition: PQP.Language.Token.TokenPosition): boolean;
|
|
@@ -11,43 +11,62 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
});
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.isAfterTokenPosition = exports.isOnTokenPosition = exports.isBeforeTokenPosition = exports.isInToken = exports.isAfterAst = exports.isOnAstEnd = exports.isOnAstStart = exports.isInAst = exports.isBeforeAst = exports.isAfterContext = exports.isOnContextEnd = exports.isOnContextStart = exports.isInContext = exports.isBeforeContext = exports.isAfterXor = exports.isOnXorEnd = exports.isOnXorStart = exports.isInXor = exports.isBeforeXor = exports.
|
|
14
|
+
exports.isAfterTokenPosition = exports.isOnTokenPosition = exports.isBeforeTokenPosition = exports.isInToken = exports.isOnTokenEnd = exports.isOnTokenStart = exports.isAfterAst = exports.isOnAstEnd = exports.isOnAstStart = exports.isInAst = exports.isBeforeAst = exports.isAfterContext = exports.isOnContextEnd = exports.isOnContextStart = exports.isInContext = exports.isBeforeContext = exports.isAfterXor = exports.isOnXorEnd = exports.isOnXorStart = exports.isInXor = exports.isBeforeXor = exports.rangeFromTokenRange = exports.rangeFromTokenPositions = exports.rangeFromXorNode = exports.positionFromTokenPosition = exports.compareTokenPosition = void 0;
|
|
15
|
+
const PQP = require("@microsoft/powerquery-parser");
|
|
15
16
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
16
17
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
17
|
-
function
|
|
18
|
+
function compareTokenPosition(position, tokenPosition) {
|
|
19
|
+
if (isOnTokenPosition(position, tokenPosition)) {
|
|
20
|
+
return "OnToken" /* OnToken */;
|
|
21
|
+
}
|
|
22
|
+
else if (isAfterTokenPosition(position, tokenPosition, false)) {
|
|
23
|
+
return "RightOfToken" /* RightOfToken */;
|
|
24
|
+
}
|
|
25
|
+
else if (isBeforeTokenPosition(position, tokenPosition, false)) {
|
|
26
|
+
return "LeftOfToken" /* LeftOfToken */;
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
throw new PQP.CommonError.InvariantError("position is not on, after, or before tokenPosition", {
|
|
30
|
+
position,
|
|
31
|
+
tokenPosition,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
exports.compareTokenPosition = compareTokenPosition;
|
|
36
|
+
function positionFromTokenPosition(tokenPosition) {
|
|
18
37
|
return {
|
|
19
38
|
line: tokenPosition.lineNumber,
|
|
20
39
|
character: tokenPosition.lineCodeUnit,
|
|
21
40
|
};
|
|
22
41
|
}
|
|
23
|
-
exports.
|
|
42
|
+
exports.positionFromTokenPosition = positionFromTokenPosition;
|
|
24
43
|
// Attempts to turn a TXorNode into a Range.
|
|
25
44
|
// Returns undefined if there are no leafs nodes.
|
|
26
|
-
function
|
|
45
|
+
function rangeFromXorNode(nodeIdMapCollection, xorNode) {
|
|
27
46
|
return __awaiter(this, void 0, void 0, function* () {
|
|
28
47
|
const nodeId = xorNode.node.id;
|
|
29
48
|
const leftMostLeaf = parser_1.NodeIdMapUtils.leftMostLeaf(nodeIdMapCollection, nodeId);
|
|
30
49
|
const rightMostLeaf = yield parser_1.NodeIdMapUtils.rightMostLeaf(nodeIdMapCollection, nodeId);
|
|
31
50
|
return Promise.resolve(leftMostLeaf === undefined || rightMostLeaf === undefined
|
|
32
51
|
? undefined
|
|
33
|
-
:
|
|
52
|
+
: rangeFromTokenPositions(leftMostLeaf.tokenRange.positionStart, rightMostLeaf.tokenRange.positionEnd));
|
|
34
53
|
});
|
|
35
54
|
}
|
|
36
|
-
exports.
|
|
37
|
-
function
|
|
55
|
+
exports.rangeFromXorNode = rangeFromXorNode;
|
|
56
|
+
function rangeFromTokenPositions(startTokenPosition, endTokenPosition) {
|
|
38
57
|
if (startTokenPosition && endTokenPosition) {
|
|
39
58
|
return {
|
|
40
|
-
start:
|
|
41
|
-
end:
|
|
59
|
+
start: positionFromTokenPosition(startTokenPosition),
|
|
60
|
+
end: positionFromTokenPosition(endTokenPosition),
|
|
42
61
|
};
|
|
43
62
|
}
|
|
44
63
|
return undefined;
|
|
45
64
|
}
|
|
46
|
-
exports.
|
|
47
|
-
function
|
|
48
|
-
return
|
|
65
|
+
exports.rangeFromTokenPositions = rangeFromTokenPositions;
|
|
66
|
+
function rangeFromTokenRange(tokenRange) {
|
|
67
|
+
return rangeFromTokenPositions(tokenRange.positionStart, tokenRange.positionEnd);
|
|
49
68
|
}
|
|
50
|
-
exports.
|
|
69
|
+
exports.rangeFromTokenRange = rangeFromTokenRange;
|
|
51
70
|
function isBeforeXor(position, xorNode, isBoundIncluded) {
|
|
52
71
|
switch (xorNode.kind) {
|
|
53
72
|
case "Ast" /* Ast */:
|
|
@@ -169,6 +188,14 @@ function isAfterAst(position, astNode, isBoundIncluded) {
|
|
|
169
188
|
return isAfterTokenPosition(position, astNode.tokenRange.positionEnd, isBoundIncluded);
|
|
170
189
|
}
|
|
171
190
|
exports.isAfterAst = isAfterAst;
|
|
191
|
+
function isOnTokenStart(position, token) {
|
|
192
|
+
return position.line === token.positionStart.lineNumber && position.character === token.positionStart.lineCodeUnit;
|
|
193
|
+
}
|
|
194
|
+
exports.isOnTokenStart = isOnTokenStart;
|
|
195
|
+
function isOnTokenEnd(position, token) {
|
|
196
|
+
return position.line === token.positionEnd.lineNumber && position.character === token.positionEnd.lineCodeUnit;
|
|
197
|
+
}
|
|
198
|
+
exports.isOnTokenEnd = isOnTokenEnd;
|
|
172
199
|
function isInToken(position, token, isLowerBoundIncluded, isHigherBoundIncluded) {
|
|
173
200
|
return (!isBeforeTokenPosition(position, token.positionStart, isLowerBoundIncluded) &&
|
|
174
201
|
!isAfterTokenPosition(position, token.positionEnd, isHigherBoundIncluded));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"positionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/positionUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"positionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/positionUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ class LibraryProvider {
|
|
|
38
38
|
const autocompleteItems = [];
|
|
39
39
|
const contextText = context.text;
|
|
40
40
|
for (const [label, definition] of this.libraryDefinitions.entries()) {
|
|
41
|
-
autocompleteItems.push(inspection_1.AutocompleteItemUtils.
|
|
41
|
+
autocompleteItems.push(inspection_1.AutocompleteItemUtils.fromLibraryDefinition(label, definition, contextText));
|
|
42
42
|
}
|
|
43
43
|
trace.exit();
|
|
44
44
|
return autocompleteItems;
|
|
@@ -120,7 +120,7 @@ class LibraryProvider {
|
|
|
120
120
|
getOrCreateSignatureInformation(key) {
|
|
121
121
|
if (!this.signatureInformationByLabel.has(key)) {
|
|
122
122
|
const definition = library_1.LibraryUtils.assertAsFunction(this.libraryDefinitions.get(key));
|
|
123
|
-
this.signatureInformationByLabel.set(key, library_1.LibraryUtils.
|
|
123
|
+
this.signatureInformationByLabel.set(key, library_1.LibraryUtils.signatureInformation(definition));
|
|
124
124
|
}
|
|
125
125
|
return powerquery_parser_1.Assert.asDefined(this.signatureInformationByLabel.get(key));
|
|
126
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libraryProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/libraryProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oEAAwF;AACxF,6EAAqG;AAErG,0FAAwF;AASxF,wCAAmD;AACnD,8CAAsD;AAGtD,MAAa,eAAe;IAKxB,YAAY,OAAyB,EAAqB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QACpE,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;QACzD,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;QACrD,IAAI,CAAC,2BAA2B,GAAG,IAAI,GAAG,EAAE,CAAC;IACjD,CAAC;IAEY,oBAAoB,CAC7B,OAAwC;;YAExC,yCAAyC;YACzC,OAAO,MAAM,+BAAW,CAAC,iBAAiB,CAAC,GAAS,EAAE;;gBAClD,MAAM,KAAK,GAAU,OAAO,CAAC,YAAY,CAAC,KAAK,sDAE3C,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAC9B,OAAO,CAAC,oBAAoB,CAC/B,CAAC;gBAEF,MAAA,OAAO,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;gBAE9C,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oBACjC,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;oBAErC,OAAO,SAAS,CAAC;iBACpB;gBAED,MAAM,iBAAiB,GAAkC,EAAE,CAAC;gBAC5D,MAAM,WAAW,GAAuB,OAAO,CAAC,IAAI,CAAC;gBAErD,KAAK,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE;oBACjE,iBAAiB,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"libraryProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/libraryProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ function getFoldingRanges(nodeIdMapCollection, nodeKind, traceManager, correlati
|
|
|
28
28
|
const trace = traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, getFoldingRanges.name, correlationId, { nodeKind });
|
|
29
29
|
const foldingRanges = [];
|
|
30
30
|
for (const nodeId of (_a = nodeIdMapCollection.idsByNodeKind.get(nodeKind)) !== null && _a !== void 0 ? _a : []) {
|
|
31
|
-
const node = parser_1.NodeIdMapUtils.
|
|
31
|
+
const node = parser_1.NodeIdMapUtils.astChecked(nodeIdMapCollection, nodeId, nodeKind);
|
|
32
32
|
if (node === undefined) {
|
|
33
33
|
continue;
|
|
34
34
|
}
|
package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"foldingRanges.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/providers/localDocumentProvider/foldingRanges.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,sFAAsG;AAQtG,SAAgB,mBAAmB,CAC/B,mBAAyC,EACzC,YAA0B,EAC1B,aAAqB;IAErB,MAAM,KAAK,GAAU,YAAY,CAAC,KAAK,kEAEnC,mBAAmB,CAAC,IAAI,EACxB,aAAa,CAChB,CAAC;IAEF,IAAI,aAAa,GAAmB,EAAE,CAAC;IAEvC,aAAa,GAAG,aAAa;SACxB,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,iDAAmC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACtG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,qCAA6B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAChG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,6CAAiC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACpG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,uCAA8B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACjG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,yCAA+B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAClG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,mCAA4B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC/F,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,iDAAmC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACtG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,6CAAiC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACpG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,uCAA8B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACjG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,uCAA8B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACjG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,2CAAgC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAEzG,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,aAAa,CAAC;AACzB,CAAC;AA7BD,kDA6BC;AAED,SAAS,gBAAgB,CACrB,mBAAyC,EACzC,QAAmB,EACnB,YAA0B,EAC1B,aAAqB;;IAErB,MAAM,KAAK,GAAU,YAAY,CAAC,KAAK,kEAEnC,gBAAgB,CAAC,IAAI,EACrB,aAAa,EACb,EAAE,QAAQ,EAAE,CACf,CAAC;IAEF,MAAM,aAAa,GAAmB,EAAE,CAAC;IAEzC,KAAK,MAAM,MAAM,IAAI,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,mCAAI,EAAE,EAAE;QACxE,MAAM,IAAI,GAAkB,uBAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"foldingRanges.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/providers/localDocumentProvider/foldingRanges.ts"],"names":[],"mappings":"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"}
|
package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js
CHANGED
|
@@ -64,7 +64,7 @@ class LocalDocumentProvider {
|
|
|
64
64
|
return undefined;
|
|
65
65
|
}
|
|
66
66
|
const location = {
|
|
67
|
-
range: __1.PositionUtils.
|
|
67
|
+
range: __1.PositionUtils.rangeFromTokenRange(creator.tokenRange),
|
|
68
68
|
uri: this.uri,
|
|
69
69
|
};
|
|
70
70
|
trace.exit();
|
|
@@ -178,7 +178,7 @@ class LocalDocumentProvider {
|
|
|
178
178
|
trace.exit();
|
|
179
179
|
return undefined;
|
|
180
180
|
}
|
|
181
|
-
const identifierPairedExpression = parser_1.AncestryUtils.
|
|
181
|
+
const identifierPairedExpression = parser_1.AncestryUtils.nthChecked(context.activeNode.ancestry, 1, [
|
|
182
182
|
"GeneralizedIdentifierPairedAnyLiteral" /* GeneralizedIdentifierPairedAnyLiteral */,
|
|
183
183
|
"GeneralizedIdentifierPairedExpression" /* GeneralizedIdentifierPairedExpression */,
|
|
184
184
|
"IdentifierPairedExpression" /* IdentifierPairedExpression */,
|
|
@@ -188,7 +188,7 @@ class LocalDocumentProvider {
|
|
|
188
188
|
trace.exit();
|
|
189
189
|
return undefined;
|
|
190
190
|
}
|
|
191
|
-
const expression = parser_1.NodeIdMapUtils.
|
|
191
|
+
const expression = parser_1.NodeIdMapUtils.nthChildXor(context.parseState.contextState.nodeIdMapCollection, identifierPairedExpression.node.id, 2);
|
|
192
192
|
// We're on an identifier in some other context which we don't support.
|
|
193
193
|
if (expression === undefined) {
|
|
194
194
|
trace.exit();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localDocumentProvider.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAKmE;AACnE,0FAAmG;AACnG,oEAAgF;AAChF,6EAAoH;AAGpH,yDAAyD;AAWzD,6BAAkD;AAClD,mDAAsD;AACtD,iEAAqE;AAGrE,iDAA8C;AAE9C,MAAa,qBAAqB;IAC9B,YACqB,GAAgB,EAChB,SAA+B,EAC/B,OAAiB,EACf,MAAc;QAHhB,QAAG,GAAH,GAAG,CAAa;QAChB,cAAS,GAAT,SAAS,CAAsB;QAC/B,YAAO,GAAP,OAAO,CAAU;QACf,WAAM,GAAN,MAAM,CAAQ;IAClC,CAAC;IAEG,oBAAoB,CACvB,OAAwC;QAExC,yCAAyC;QACzC,OAAO,+BAAW,CAAC,iBAAiB,CAAC,GAAS,EAAE;;YAC5C,MAAM,KAAK,GAAU,OAAO,CAAC,YAAY,CAAC,KAAK,kEAE3C,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAC9B,OAAO,CAAC,oBAAoB,CAC/B,CAAC;YAEF,MAAA,OAAO,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;YAE9C,MAAM,iBAAiB,GAAkC;gBACrD,GAAG,IAAI,CAAC,mCAAmC,CAAC,OAAO,CAAC,YAAY,CAAC;aACpE,CAAC,MAAM,CAAC,eAAe,CAAC,6BAA6B,CAAC,OAAO,CAAC,CAAC,CAAC;YAEjE,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,iBAAiB,CAAC;QAC7B,CAAC,CAAA,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAEM,aAAa,CAChB,OAAkC;QAElC,yCAAyC;QACzC,OAAO,+BAAW,CAAC,iBAAiB,CAAC,GAAS,EAAE;;YAC5C,MAAM,KAAK,GAAU,OAAO,CAAC,YAAY,CAAC,KAAK,kEAE3C,IAAI,CAAC,aAAa,CAAC,IAAI,EACvB,OAAO,CAAC,oBAAoB,CAC/B,CAAC;YAEF,MAAA,OAAO,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;YAE9C,IACI,OAAO,CAAC,UAAU,CAAC,IAAI,wDAAuC;gBAC9D,OAAO,CAAC,UAAU,CAAC,qBAAqB,wBAAoC,EAC9E;gBACE,OAAO,SAAS,CAAC;aACpB;YAED,MAAM,cAAc,GAA8B,OAAO,CAAC,cAAc,CAAC;YAEzE,IAAI,+BAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;gBACrC,OAAO,SAAS,CAAC;aACpB;YAED,MAAM,SAAS,GAAsC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAE1G,IAAI,SAAS,KAAK,SAAS,EAAE;gBACzB,OAAO,SAAS,CAAC;aACpB;YAED,MAAM,OAAO,GACT,uBAAU,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;YAEjD,IAAI,OAAO,KAAK,SAAS,EAAE;gBACvB,OAAO,SAAS,CAAC;aACpB;YAED,MAAM,QAAQ,GAAa;gBACvB,KAAK,EAAE,iBAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"localDocumentProvider.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.ts"],"names":[],"mappings":"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"}
|
package/lib/powerquery-language-services/providers/localDocumentProvider/partialSemanticToken.js
CHANGED
|
@@ -111,7 +111,7 @@ function getIdentifierExpressionTokens(nodeIdMapCollection, libraryDefinitions,
|
|
|
111
111
|
continue;
|
|
112
112
|
}
|
|
113
113
|
tokens.push({
|
|
114
|
-
range: __1.PositionUtils.
|
|
114
|
+
range: __1.PositionUtils.rangeFromTokenRange(identifierExpr.tokenRange),
|
|
115
115
|
tokenModifiers,
|
|
116
116
|
tokenType,
|
|
117
117
|
});
|
|
@@ -129,11 +129,11 @@ function getInvokeExpressionTokens(nodeIdMapCollection, traceManager, correlatio
|
|
|
129
129
|
for (const nodeId of (_a = nodeIdMapCollection.idsByNodeKind.get("InvokeExpression" /* InvokeExpression */)) !== null && _a !== void 0 ? _a : []) {
|
|
130
130
|
cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.throwIfCancelled();
|
|
131
131
|
const identifierXor = parser_1.NodeIdMapUtils.invokeExpressionIdentifier(nodeIdMapCollection, nodeId);
|
|
132
|
-
if (identifierXor === undefined || !parser_1.XorNodeUtils.
|
|
132
|
+
if (identifierXor === undefined || !parser_1.XorNodeUtils.isAst(identifierXor)) {
|
|
133
133
|
continue;
|
|
134
134
|
}
|
|
135
135
|
tokens.push({
|
|
136
|
-
range: __1.PositionUtils.
|
|
136
|
+
range: __1.PositionUtils.rangeFromTokenRange(identifierXor.node.tokenRange),
|
|
137
137
|
tokenModifiers: [],
|
|
138
138
|
tokenType: vscode_languageserver_types_1.SemanticTokenTypes.function,
|
|
139
139
|
});
|
|
@@ -160,7 +160,7 @@ function getLiteralTokens(nodeIdMapCollection, traceManager, correlationId, canc
|
|
|
160
160
|
continue;
|
|
161
161
|
}
|
|
162
162
|
tokens.push({
|
|
163
|
-
range: __1.PositionUtils.
|
|
163
|
+
range: __1.PositionUtils.rangeFromTokenRange(literal.tokenRange),
|
|
164
164
|
tokenModifiers: [],
|
|
165
165
|
tokenType,
|
|
166
166
|
});
|
|
@@ -210,12 +210,12 @@ function getPrimitiveTypeTokens(nodeIdMapCollection, traceManager, correlationId
|
|
|
210
210
|
const tokens = [];
|
|
211
211
|
for (const nodeId of (_a = nodeIdMapCollection.idsByNodeKind.get("PrimitiveType" /* PrimitiveType */)) !== null && _a !== void 0 ? _a : []) {
|
|
212
212
|
cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.throwIfCancelled();
|
|
213
|
-
const node = parser_1.NodeIdMapUtils.
|
|
213
|
+
const node = parser_1.NodeIdMapUtils.astChecked(nodeIdMapCollection, nodeId, "PrimitiveType" /* PrimitiveType */);
|
|
214
214
|
if (node === undefined) {
|
|
215
215
|
continue;
|
|
216
216
|
}
|
|
217
217
|
tokens.push({
|
|
218
|
-
range: __1.PositionUtils.
|
|
218
|
+
range: __1.PositionUtils.rangeFromTokenRange(node.tokenRange),
|
|
219
219
|
tokenModifiers: [],
|
|
220
220
|
tokenType: vscode_languageserver_types_1.SemanticTokenTypes.type,
|
|
221
221
|
});
|
|
@@ -244,7 +244,7 @@ function getTBinOpExpressionTokens(nodeIdMapCollection, traceManager, correlatio
|
|
|
244
244
|
if (exprXorNode === undefined) {
|
|
245
245
|
continue;
|
|
246
246
|
}
|
|
247
|
-
const operatorNode = parser_1.NodeIdMapUtils.
|
|
247
|
+
const operatorNode = parser_1.NodeIdMapUtils.nthChildAstChecked(nodeIdMapCollection, exprXorNode.node.id, 1, "Constant" /* Constant */);
|
|
248
248
|
if (operatorNode === undefined) {
|
|
249
249
|
continue;
|
|
250
250
|
}
|
|
@@ -256,7 +256,7 @@ function getTBinOpExpressionTokens(nodeIdMapCollection, traceManager, correlatio
|
|
|
256
256
|
? vscode_languageserver_types_1.SemanticTokenTypes.keyword
|
|
257
257
|
: vscode_languageserver_types_1.SemanticTokenTypes.operator;
|
|
258
258
|
tokens.push({
|
|
259
|
-
range: __1.PositionUtils.
|
|
259
|
+
range: __1.PositionUtils.rangeFromTokenRange(operatorNode.tokenRange),
|
|
260
260
|
tokenModifiers: [],
|
|
261
261
|
tokenType,
|
|
262
262
|
});
|
|
@@ -293,12 +293,12 @@ function getPairedExpressionTokens(nodeIdMapCollection, pairedKind, keyKind, tra
|
|
|
293
293
|
const tokens = [];
|
|
294
294
|
for (const nodeId of (_a = nodeIdMapCollection.idsByNodeKind.get(pairedKind)) !== null && _a !== void 0 ? _a : []) {
|
|
295
295
|
cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.throwIfCancelled();
|
|
296
|
-
const keyNode = parser_1.NodeIdMapUtils.
|
|
296
|
+
const keyNode = parser_1.NodeIdMapUtils.nthChildAstChecked(nodeIdMapCollection, nodeId, 0, keyKind);
|
|
297
297
|
if (keyNode === undefined) {
|
|
298
298
|
continue;
|
|
299
299
|
}
|
|
300
300
|
tokens.push({
|
|
301
|
-
range: __1.PositionUtils.
|
|
301
|
+
range: __1.PositionUtils.rangeFromTokenRange(keyNode.tokenRange),
|
|
302
302
|
tokenModifiers: [vscode_languageserver_types_1.SemanticTokenModifiers.declaration],
|
|
303
303
|
tokenType: vscode_languageserver_types_1.SemanticTokenTypes.variable,
|
|
304
304
|
});
|
|
@@ -307,12 +307,12 @@ function getPairedExpressionTokens(nodeIdMapCollection, pairedKind, keyKind, tra
|
|
|
307
307
|
return tokens;
|
|
308
308
|
}
|
|
309
309
|
function pushNthChild(nodeIdMapCollection, parentId, childNodeKind, attributeIndex, tokens, tokenType, tokenModifiers = []) {
|
|
310
|
-
const typeConstant = parser_1.NodeIdMapUtils.
|
|
310
|
+
const typeConstant = parser_1.NodeIdMapUtils.nthChildAstChecked(nodeIdMapCollection, parentId, attributeIndex, childNodeKind);
|
|
311
311
|
if (typeConstant === undefined) {
|
|
312
312
|
return;
|
|
313
313
|
}
|
|
314
314
|
tokens.push({
|
|
315
|
-
range: __1.PositionUtils.
|
|
315
|
+
range: __1.PositionUtils.rangeFromTokenRange(typeConstant.tokenRange),
|
|
316
316
|
tokenModifiers,
|
|
317
317
|
tokenType,
|
|
318
318
|
});
|