@microsoft/powerquery-language-services 0.2.19 → 0.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/powerquery-language-services/analysis/analysisBase.d.ts +4 -6
- package/lib/powerquery-language-services/analysis/analysisBase.js +118 -223
- package/lib/powerquery-language-services/analysis/analysisBase.js.map +1 -1
- package/lib/powerquery-language-services/analysis/analysisSettings.d.ts +2 -2
- package/lib/powerquery-language-services/analysis/analysisUtils.js +1 -1
- package/lib/powerquery-language-services/analysis/analysisUtils.js.map +1 -1
- package/lib/powerquery-language-services/analysis/documentAnalysis.d.ts +0 -2
- package/lib/powerquery-language-services/analysis/documentAnalysis.js +11 -32
- package/lib/powerquery-language-services/analysis/documentAnalysis.js.map +1 -1
- package/lib/powerquery-language-services/commonTypes.js +1 -1
- package/lib/powerquery-language-services/commonTypes.js.map +1 -1
- package/lib/powerquery-language-services/documentSymbols.d.ts +1 -1
- package/lib/powerquery-language-services/documentSymbols.js +62 -111
- package/lib/powerquery-language-services/documentSymbols.js.map +1 -1
- package/lib/powerquery-language-services/formatter.d.ts +1 -1
- package/lib/powerquery-language-services/formatter.js +35 -34
- package/lib/powerquery-language-services/formatter.js.map +1 -1
- package/lib/powerquery-language-services/index.js +2 -2
- package/lib/powerquery-language-services/index.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js +74 -131
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/index.js +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/index.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js +117 -187
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js +28 -28
- 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 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js +97 -114
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js +11 -11
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js +9 -9
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js +5 -5
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js +43 -56
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js +10 -10
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js +11 -11
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js +5 -5
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.js +28 -28
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js +28 -31
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js +19 -23
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteUtils.js +5 -5
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/common.js +2 -13
- package/lib/powerquery-language-services/inspection/autocomplete/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/index.js +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/index.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/task.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/task.js +36 -25
- package/lib/powerquery-language-services/inspection/autocomplete/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/commonTypes.d.ts +6 -5
- package/lib/powerquery-language-services/inspection/expectedType.js +18 -18
- package/lib/powerquery-language-services/inspection/expectedType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/externalType/externalType.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/externalType/externalType.js +2 -1
- package/lib/powerquery-language-services/inspection/externalType/externalType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/externalType/externalTypeUtils.js +3 -3
- package/lib/powerquery-language-services/inspection/externalType/externalTypeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js +49 -66
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js +74 -99
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/jaroWinkler.js +26 -42
- package/lib/powerquery-language-services/inspection/jaroWinkler.js.map +1 -1
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js +24 -51
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.d.ts +3 -3
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js +221 -275
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/task.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/task.js +71 -41
- package/lib/powerquery-language-services/inspection/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/index.js +1 -1
- package/lib/powerquery-language-services/inspection/type/index.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.d.ts +9 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js +354 -339
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js +31 -41
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js +29 -19
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js +27 -17
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.d.ts +4 -0
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js +68 -0
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js.map +1 -0
- package/lib/powerquery-language-services/inspection/type/inspectType/{inspectTypeFieldProjection.d.ts → inspectTypeField/inspectTypeFieldProjection.d.ts} +2 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js +103 -0
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js.map +1 -0
- package/lib/powerquery-language-services/inspection/type/inspectType/{inspectTypeFieldSelector.d.ts → inspectTypeField/inspectTypeFieldSelector.d.ts} +2 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js +76 -0
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js.map +1 -0
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js +24 -12
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js +65 -55
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js +43 -35
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js +28 -18
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js +28 -18
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js +42 -30
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js +55 -64
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js +26 -16
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js +34 -24
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js +9 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js +33 -23
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js +22 -23
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js +9 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js +40 -30
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js +31 -41
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js +27 -28
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js +44 -54
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js +155 -179
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js +36 -37
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js +57 -105
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/task.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/type/task.js +59 -104
- package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
- package/lib/powerquery-language-services/inspectionSettings.d.ts +2 -0
- package/lib/powerquery-language-services/inspectionUtils.d.ts +5 -4
- package/lib/powerquery-language-services/inspectionUtils.js +80 -134
- package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
- package/lib/powerquery-language-services/languageServiceUtils.js +1 -1
- package/lib/powerquery-language-services/languageServiceUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/libraryUtils.js +11 -11
- package/lib/powerquery-language-services/library/libraryUtils.js.map +1 -1
- package/lib/powerquery-language-services/localization/localization.js +9 -13
- package/lib/powerquery-language-services/localization/localization.js.map +1 -1
- package/lib/powerquery-language-services/localization/localizationUtils.js +1 -1
- package/lib/powerquery-language-services/localization/localizationUtils.js.map +1 -1
- package/lib/powerquery-language-services/localization/templates.js +43 -43
- package/lib/powerquery-language-services/localization/templates.js.map +1 -1
- package/lib/powerquery-language-services/positionUtils.d.ts +5 -5
- package/lib/powerquery-language-services/positionUtils.js +47 -33
- package/lib/powerquery-language-services/positionUtils.js.map +1 -1
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.d.ts +3 -3
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js +40 -95
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/librarySymbolProvider.js +63 -138
- package/lib/powerquery-language-services/providers/librarySymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentSymbolProvider.d.ts +3 -5
- package/lib/powerquery-language-services/providers/localDocumentSymbolProvider.js +130 -194
- package/lib/powerquery-language-services/providers/localDocumentSymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/nullSymbolProvider.js +18 -52
- package/lib/powerquery-language-services/providers/nullSymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/validate/validate.d.ts +1 -1
- package/lib/powerquery-language-services/validate/validate.js +38 -42
- package/lib/powerquery-language-services/validate/validate.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.d.ts +1 -1
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js +82 -127
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateFunctionExpression.d.ts +1 -1
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js +61 -101
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateInvokeExpression.d.ts +1 -1
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js +61 -98
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateLexAndParse.d.ts +1 -1
- package/lib/powerquery-language-services/validate/validateLexAndParse.js +112 -122
- package/lib/powerquery-language-services/validate/validateLexAndParse.js.map +1 -1
- package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js +1 -12
- package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js.map +1 -1
- package/lib/powerquery-language-services/workspaceCache/workspaceCache.d.ts +3 -13
- package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.d.ts +7 -8
- package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.js +93 -147
- package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.js.map +1 -1
- package/package.json +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldProjection.js +0 -126
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldProjection.js.map +0 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSelector.js +0 -67
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSelector.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateFunctionExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateFunctionExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"validateFunctionExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateFunctionExpression.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,4 @@ import { Diagnostic } from "vscode-languageserver-types";
|
|
|
2
2
|
import { NodeIdMap } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
3
|
import { Inspection } from "..";
|
|
4
4
|
import { ValidationSettings } from "./validationSettings";
|
|
5
|
-
export declare function validateInvokeExpression(validationSettings: ValidationSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeCache?: Inspection.TypeCache): Diagnostic[]
|
|
5
|
+
export declare function validateInvokeExpression(validationSettings: ValidationSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeCache?: Inspection.TypeCache): Promise<Diagnostic[]>;
|
|
@@ -1,110 +1,73 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
|
-
var
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
};
|
|
13
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
14
|
-
};
|
|
15
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
16
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
17
|
-
if (!m) return o;
|
|
18
|
-
var i = m.call(o), r, ar = [], e;
|
|
19
|
-
try {
|
|
20
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
21
|
-
}
|
|
22
|
-
catch (error) { e = { error: error }; }
|
|
23
|
-
finally {
|
|
24
|
-
try {
|
|
25
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
26
|
-
}
|
|
27
|
-
finally { if (e) throw e.error; }
|
|
28
|
-
}
|
|
29
|
-
return ar;
|
|
30
|
-
};
|
|
31
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
32
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
33
|
-
if (ar || !(i in from)) {
|
|
34
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
35
|
-
ar[i] = from[i];
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
4
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
5
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
6
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
7
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
8
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
9
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
10
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
11
|
+
});
|
|
39
12
|
};
|
|
40
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
41
14
|
exports.validateInvokeExpression = void 0;
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
15
|
+
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
16
|
+
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
17
|
+
const vscode_languageserver_types_1 = require("vscode-languageserver-types");
|
|
18
|
+
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
19
|
+
const __1 = require("..");
|
|
20
|
+
const localization_1 = require("../localization");
|
|
21
|
+
const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
|
|
49
22
|
function validateInvokeExpression(validationSettings, nodeIdMapCollection, maybeCache) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
23
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
+
const maybeInvokeExpressionIds = nodeIdMapCollection.idsByNodeKind.get("InvokeExpression" /* InvokeExpression */);
|
|
25
|
+
if (maybeInvokeExpressionIds === undefined) {
|
|
26
|
+
return [];
|
|
27
|
+
}
|
|
28
|
+
const inspectionTasks = [];
|
|
29
|
+
for (const nodeId of maybeInvokeExpressionIds) {
|
|
30
|
+
inspectionTasks.push(__1.Inspection.tryInvokeExpression(validationSettings, nodeIdMapCollection, nodeId, maybeCache));
|
|
31
|
+
}
|
|
32
|
+
const inspections = yield Promise.all(inspectionTasks);
|
|
33
|
+
const diagnosticTasks = [];
|
|
34
|
+
for (const triedInvokeExpression of inspections) {
|
|
35
|
+
if (powerquery_parser_1.ResultUtils.isOk(triedInvokeExpression)) {
|
|
36
|
+
diagnosticTasks.push(invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection, triedInvokeExpression.value));
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
61
39
|
throw triedInvokeExpression;
|
|
62
40
|
}
|
|
63
|
-
result.push.apply(result, __spreadArray([], __read(invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection, triedInvokeExpression.value)), false));
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
67
|
-
finally {
|
|
68
|
-
try {
|
|
69
|
-
if (maybeInvokeExpressionIds_1_1 && !maybeInvokeExpressionIds_1_1.done && (_a = maybeInvokeExpressionIds_1.return)) _a.call(maybeInvokeExpressionIds_1);
|
|
70
41
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
42
|
+
const diagnostics = yield Promise.all(diagnosticTasks);
|
|
43
|
+
return diagnostics.flat();
|
|
44
|
+
});
|
|
74
45
|
}
|
|
75
46
|
exports.validateInvokeExpression = validateInvokeExpression;
|
|
76
47
|
function invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection, inspected) {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
var maybeGivenArgumentRange = __1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, givenArguments[argIndex]);
|
|
48
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
49
|
+
const result = [];
|
|
50
|
+
if (inspected.maybeArguments !== undefined) {
|
|
51
|
+
const invokeExpressionArguments = inspected.maybeArguments;
|
|
52
|
+
const givenArguments = inspected.maybeArguments.givenArguments;
|
|
53
|
+
const invokeExpressionRange = powerquery_parser_1.Assert.asDefined(yield __1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, inspected.invokeExpressionXorNode), "expected at least one leaf node under InvokeExpression");
|
|
54
|
+
const maybeFunctionName = parser_1.NodeIdMapUtils.maybeInvokeExpressionIdentifierLiteral(nodeIdMapCollection, inspected.invokeExpressionXorNode.node.id);
|
|
55
|
+
for (const [argIndex, mismatch] of invokeExpressionArguments.typeChecked.invalid.entries()) {
|
|
56
|
+
// eslint-disable-next-line no-await-in-loop
|
|
57
|
+
const maybeGivenArgumentRange = yield __1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, givenArguments[argIndex]);
|
|
88
58
|
result.push(createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybeFunctionName, invokeExpressionRange, maybeGivenArgumentRange));
|
|
89
59
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
60
|
+
const numGivenArguments = invokeExpressionArguments.givenArguments.length;
|
|
61
|
+
if (numGivenArguments < invokeExpressionArguments.numMinExpectedArguments ||
|
|
62
|
+
numGivenArguments > invokeExpressionArguments.numMaxExpectedArguments) {
|
|
63
|
+
result.push(createDiagnosticForArgumentNumberMismatch(validationSettings, invokeExpressionRange, invokeExpressionArguments.numMinExpectedArguments, invokeExpressionArguments.numMaxExpectedArguments, numGivenArguments));
|
|
95
64
|
}
|
|
96
|
-
finally { if (e_2) throw e_2.error; }
|
|
97
65
|
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
numGivenArguments > invokeExpressionArguments.numMaxExpectedArguments) {
|
|
101
|
-
result.push(createDiagnosticForArgumentNumberMismatch(validationSettings, invokeExpressionRange, invokeExpressionArguments.numMinExpectedArguments, invokeExpressionArguments.numMaxExpectedArguments, numGivenArguments));
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
return result;
|
|
66
|
+
return result;
|
|
67
|
+
});
|
|
105
68
|
}
|
|
106
69
|
function createDiagnosticForArgumentNumberMismatch(validationSettings, invokeExpressionRange, numMin, numMax, numGiven) {
|
|
107
|
-
|
|
70
|
+
const templates = localization_1.LocalizationUtils.getLocalizationTemplates(validationSettings.locale);
|
|
108
71
|
return {
|
|
109
72
|
code: diagnosticErrorCode_1.DiagnosticErrorCode.InvokeArgumentCountMismatch,
|
|
110
73
|
message: localization_1.Localization.error_validation_invokeExpression_numArgs(templates, numMin, numMax, numGiven),
|
|
@@ -115,14 +78,14 @@ function createDiagnosticForArgumentNumberMismatch(validationSettings, invokeExp
|
|
|
115
78
|
}
|
|
116
79
|
function createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybeFunctionName, invokeExpressionRange, maybeGivenArgumentRange) {
|
|
117
80
|
var _a;
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
81
|
+
let range;
|
|
82
|
+
let message;
|
|
83
|
+
const parameter = mismatch.expected;
|
|
84
|
+
const argName = parameter.nameLiteral;
|
|
85
|
+
const expected = language_1.TypeUtils.nameOfTypeKind((_a = parameter.maybeType) !== null && _a !== void 0 ? _a : language_1.Type.AnyInstance.kind);
|
|
123
86
|
// An argument containing at least one leaf node was given.
|
|
124
87
|
if (maybeGivenArgumentRange) {
|
|
125
|
-
|
|
88
|
+
const actual = language_1.TypeUtils.nameOfTypeKind(powerquery_parser_1.Assert.asDefined(mismatch.actual).kind);
|
|
126
89
|
range = maybeGivenArgumentRange;
|
|
127
90
|
message = createTypeMismatchMessage(validationSettings.locale, maybeFunctionName, argName, expected, actual);
|
|
128
91
|
}
|
|
@@ -132,18 +95,18 @@ function createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybe
|
|
|
132
95
|
}
|
|
133
96
|
return {
|
|
134
97
|
code: diagnosticErrorCode_1.DiagnosticErrorCode.InvokeArgumentTypeMismatch,
|
|
135
|
-
message
|
|
136
|
-
range
|
|
98
|
+
message,
|
|
99
|
+
range,
|
|
137
100
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
|
|
138
101
|
source: validationSettings.source,
|
|
139
102
|
};
|
|
140
103
|
}
|
|
141
104
|
function createMissingMandatoryMessage(locale, maybeFunctionName, argName) {
|
|
142
|
-
|
|
105
|
+
const templates = localization_1.LocalizationUtils.getLocalizationTemplates(locale);
|
|
143
106
|
return localization_1.Localization.error_validation_invokeExpression_missingMandatory(templates, maybeFunctionName, argName);
|
|
144
107
|
}
|
|
145
108
|
function createTypeMismatchMessage(locale, maybeFunctionName, argName, expected, actual) {
|
|
146
|
-
|
|
109
|
+
const templates = localization_1.LocalizationUtils.getLocalizationTemplates(locale);
|
|
147
110
|
return localization_1.Localization.error_validation_invokeExpression_typeMismatch(templates, maybeFunctionName, argName, expected, actual);
|
|
148
111
|
}
|
|
149
112
|
//# sourceMappingURL=validateInvokeExpression.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateInvokeExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateInvokeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"validateInvokeExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateInvokeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oEAAmE;AACnE,0FAAmG;AACnG,6EAA6E;AAC7E,sFAAgH;AAGhH,0BAA+C;AAC/C,kDAAkE;AAClE,gEAA6D;AAI7D,SAAsB,wBAAwB,CAC1C,kBAAsC,EACtC,mBAAyC,EACzC,UAAiC;;QAEjC,MAAM,wBAAwB,GAA4B,mBAAmB,CAAC,aAAa,CAAC,GAAG,2CAE9F,CAAC;QAEF,IAAI,wBAAwB,KAAK,SAAS,EAAE;YACxC,OAAO,EAAE,CAAC;SACb;QAED,MAAM,eAAe,GAAgD,EAAE,CAAC;QAExE,KAAK,MAAM,MAAM,IAAI,wBAAwB,EAAE;YAC3C,eAAe,CAAC,IAAI,CAChB,cAAU,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,EAAE,UAAU,CAAC,CAC9F,CAAC;SACL;QAED,MAAM,WAAW,GAAoD,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAExG,MAAM,eAAe,GAAyC,EAAE,CAAC;QAEjE,KAAK,MAAM,qBAAqB,IAAI,WAAW,EAAE;YAC7C,IAAI,+BAAW,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE;gBACzC,eAAe,CAAC,IAAI,CAChB,6BAA6B,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,qBAAqB,CAAC,KAAK,CAAC,CACtG,CAAC;aACL;iBAAM;gBACH,MAAM,qBAAqB,CAAC;aAC/B;SACJ;QAED,MAAM,WAAW,GAA6C,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAEjG,OAAO,WAAW,CAAC,IAAI,EAAE,CAAC;IAC9B,CAAC;CAAA;AAtCD,4DAsCC;AAED,SAAe,6BAA6B,CACxC,kBAAsC,EACtC,mBAAyC,EACzC,SAAsC;;QAEtC,MAAM,MAAM,GAAiB,EAAE,CAAC;QAEhC,IAAI,SAAS,CAAC,cAAc,KAAK,SAAS,EAAE;YACxC,MAAM,yBAAyB,GAAyC,SAAS,CAAC,cAAc,CAAC;YACjG,MAAM,cAAc,GAA4B,SAAS,CAAC,cAAc,CAAC,cAAc,CAAC;YAExF,MAAM,qBAAqB,GAAU,0BAAM,CAAC,SAAS,CACjD,MAAM,iBAAa,CAAC,sBAAsB,CAAC,mBAAmB,EAAE,SAAS,CAAC,uBAAuB,CAAC,EAClG,wDAAwD,CAC3D,CAAC;YAEF,MAAM,iBAAiB,GAAuB,uBAAc,CAAC,sCAAsC,CAC/F,mBAAmB,EACnB,SAAS,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAC5C,CAAC;YAEF,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,yBAAyB,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;gBACxF,4CAA4C;gBAC5C,MAAM,uBAAuB,GAAsB,MAAM,iBAAa,CAAC,sBAAsB,CACzF,mBAAmB,EACnB,cAAc,CAAC,QAAQ,CAAC,CAC3B,CAAC;gBAEF,MAAM,CAAC,IAAI,CACP,mCAAmC,CAC/B,kBAAkB,EAClB,QAAQ,EACR,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,CAC1B,CACJ,CAAC;aACL;YAED,MAAM,iBAAiB,GAAW,yBAAyB,CAAC,cAAc,CAAC,MAAM,CAAC;YAElF,IACI,iBAAiB,GAAG,yBAAyB,CAAC,uBAAuB;gBACrE,iBAAiB,GAAG,yBAAyB,CAAC,uBAAuB,EACvE;gBACE,MAAM,CAAC,IAAI,CACP,yCAAyC,CACrC,kBAAkB,EAClB,qBAAqB,EACrB,yBAAyB,CAAC,uBAAuB,EACjD,yBAAyB,CAAC,uBAAuB,EACjD,iBAAiB,CACpB,CACJ,CAAC;aACL;SACJ;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AAED,SAAS,yCAAyC,CAC9C,kBAAsC,EACtC,qBAA4B,EAC5B,MAAc,EACd,MAAc,EACd,QAAgB;IAEhB,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEhH,OAAO;QACH,IAAI,EAAE,yCAAmB,CAAC,2BAA2B;QACrD,OAAO,EAAE,2BAAY,CAAC,yCAAyC,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC;QACpG,KAAK,EAAE,qBAAqB;QAC5B,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC;AACN,CAAC;AAED,SAAS,mCAAmC,CACxC,kBAAsC,EACtC,QAAsC,EACtC,iBAAqC,EACrC,qBAA4B,EAC5B,uBAA0C;;IAE1C,IAAI,KAAY,CAAC;IACjB,IAAI,OAAe,CAAC;IAEpB,MAAM,SAAS,GAA2B,QAAQ,CAAC,QAAQ,CAAC;IAC5D,MAAM,OAAO,GAAW,SAAS,CAAC,WAAW,CAAC;IAC9C,MAAM,QAAQ,GAAW,oBAAS,CAAC,cAAc,CAAC,MAAA,SAAS,CAAC,SAAS,mCAAI,eAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAEhG,2DAA2D;IAC3D,IAAI,uBAAuB,EAAE;QACzB,MAAM,MAAM,GAAW,oBAAS,CAAC,cAAc,CAAC,0BAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;QAExF,KAAK,GAAG,uBAAuB,CAAC;QAChC,OAAO,GAAG,yBAAyB,CAAC,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;KAChH;SAAM;QACH,KAAK,GAAG,qBAAqB,CAAC;QAC9B,OAAO,GAAG,6BAA6B,CAAC,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;KAClG;IAED,OAAO;QACH,IAAI,EAAE,yCAAmB,CAAC,0BAA0B;QACpD,OAAO;QACP,KAAK;QACL,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC;AACN,CAAC;AAED,SAAS,6BAA6B,CAAC,MAAc,EAAE,iBAAqC,EAAE,OAAe;IACzG,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAE7F,OAAO,2BAAY,CAAC,kDAAkD,CAAC,SAAS,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;AAClH,CAAC;AAED,SAAS,yBAAyB,CAC9B,MAAc,EACd,iBAAqC,EACrC,OAAe,EACf,QAAgB,EAChB,MAAc;IAEd,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAE7F,OAAO,2BAAY,CAAC,8CAA8C,CAC9D,SAAS,EACT,iBAAiB,EACjB,OAAO,EACP,QAAQ,EACR,MAAM,CACT,CAAC;AACN,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Diagnostic } from "vscode-languageserver-types";
|
|
2
2
|
import { TextDocument } from "vscode-languageserver-textdocument";
|
|
3
3
|
import { ValidationSettings } from "./validationSettings";
|
|
4
|
-
export declare function validateLexAndParse(textDocument: TextDocument, validationSettings: ValidationSettings): Diagnostic[]
|
|
4
|
+
export declare function validateLexAndParse(textDocument: TextDocument, validationSettings: ValidationSettings): Promise<Diagnostic[]>;
|
|
@@ -1,151 +1,141 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
|
-
var
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
};
|
|
13
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
4
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
5
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
6
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
7
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
8
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
9
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
10
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
11
|
+
});
|
|
14
12
|
};
|
|
15
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
14
|
exports.validateLexAndParse = void 0;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
15
|
+
const PQP = require("@microsoft/powerquery-parser");
|
|
16
|
+
const vscode_languageserver_types_1 = require("vscode-languageserver-types");
|
|
17
|
+
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
18
|
+
const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
|
|
19
|
+
const workspaceCache_1 = require("../workspaceCache");
|
|
22
20
|
function validateLexAndParse(textDocument, validationSettings) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
21
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
+
const parsePromise = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, validationSettings);
|
|
23
|
+
if (parsePromise !== undefined) {
|
|
24
|
+
return yield validateParse(parsePromise, validationSettings);
|
|
25
|
+
}
|
|
26
|
+
const lexPromise = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateLexPromise(textDocument, validationSettings);
|
|
27
|
+
if (lexPromise !== undefined) {
|
|
28
|
+
return validateLex(lexPromise, validationSettings);
|
|
29
|
+
}
|
|
31
30
|
return [];
|
|
32
|
-
}
|
|
31
|
+
});
|
|
33
32
|
}
|
|
34
33
|
exports.validateLexAndParse = validateLexAndParse;
|
|
35
34
|
function validateLex(triedLex, validationSettings) {
|
|
36
|
-
var e_1, _a;
|
|
37
35
|
if (PQP.TaskUtils.isOk(triedLex) || !PQP.Lexer.LexError.isLexError(triedLex.error)) {
|
|
38
36
|
return [];
|
|
39
37
|
}
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
const error = triedLex.error;
|
|
39
|
+
const diagnostics = [];
|
|
42
40
|
// TODO: handle other types of lexer errors
|
|
43
41
|
if (error instanceof PQP.Lexer.LexError.ErrorLineMapError) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
42
|
+
for (const errorLine of error.errorLineMap.values()) {
|
|
43
|
+
const innerError = errorLine.error.innerError;
|
|
44
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
45
|
+
if (innerError.graphemePosition) {
|
|
48
46
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
},
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
72
|
-
finally {
|
|
73
|
-
try {
|
|
74
|
-
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
47
|
+
const graphemePosition = innerError.graphemePosition;
|
|
48
|
+
const message = innerError.message;
|
|
49
|
+
const position = {
|
|
50
|
+
line: graphemePosition.lineNumber,
|
|
51
|
+
character: graphemePosition.lineCodeUnit,
|
|
52
|
+
};
|
|
53
|
+
// TODO: "lex" errors aren't that useful to display to end user. Should we make it more generic?
|
|
54
|
+
diagnostics.push({
|
|
55
|
+
code: diagnosticErrorCode_1.DiagnosticErrorCode.LexError,
|
|
56
|
+
message,
|
|
57
|
+
severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
|
|
58
|
+
source: validationSettings === null || validationSettings === void 0 ? void 0 : validationSettings.source,
|
|
59
|
+
range: {
|
|
60
|
+
start: position,
|
|
61
|
+
end: position,
|
|
62
|
+
},
|
|
63
|
+
});
|
|
75
64
|
}
|
|
76
|
-
finally { if (e_1) throw e_1.error; }
|
|
77
65
|
}
|
|
78
66
|
}
|
|
79
67
|
return diagnostics;
|
|
80
68
|
}
|
|
81
69
|
function validateParse(triedParse, validationSettings) {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
}
|
|
85
|
-
var error = triedParse.error;
|
|
86
|
-
var innerError = error.innerError;
|
|
87
|
-
var message = error.message;
|
|
88
|
-
var parseContextState = error.state.contextState;
|
|
89
|
-
var maybeErrorToken;
|
|
90
|
-
if ((innerError instanceof PQP.Parser.ParseError.ExpectedAnyTokenKindError ||
|
|
91
|
-
innerError instanceof PQP.Parser.ParseError.ExpectedTokenKindError) &&
|
|
92
|
-
innerError.maybeFoundToken !== undefined) {
|
|
93
|
-
maybeErrorToken = innerError.maybeFoundToken.token;
|
|
94
|
-
}
|
|
95
|
-
else if (innerError instanceof PQP.Parser.ParseError.InvalidPrimitiveTypeError) {
|
|
96
|
-
maybeErrorToken = innerError.token;
|
|
97
|
-
}
|
|
98
|
-
else if (innerError instanceof PQP.Parser.ParseError.UnterminatedSequence) {
|
|
99
|
-
maybeErrorToken = innerError.startToken;
|
|
100
|
-
}
|
|
101
|
-
else if (innerError instanceof PQP.Parser.ParseError.UnusedTokensRemainError) {
|
|
102
|
-
maybeErrorToken = innerError.firstUnusedToken;
|
|
103
|
-
}
|
|
104
|
-
else {
|
|
105
|
-
maybeErrorToken = undefined;
|
|
106
|
-
}
|
|
107
|
-
var range;
|
|
108
|
-
if (maybeErrorToken !== undefined) {
|
|
109
|
-
range = {
|
|
110
|
-
start: {
|
|
111
|
-
line: maybeErrorToken.positionStart.lineNumber,
|
|
112
|
-
character: maybeErrorToken.positionStart.lineCodeUnit,
|
|
113
|
-
},
|
|
114
|
-
end: {
|
|
115
|
-
line: maybeErrorToken.positionEnd.lineNumber,
|
|
116
|
-
character: maybeErrorToken.positionEnd.lineCodeUnit,
|
|
117
|
-
},
|
|
118
|
-
};
|
|
119
|
-
}
|
|
120
|
-
else {
|
|
121
|
-
var maybeRoot = parseContextState.maybeRoot;
|
|
122
|
-
if (maybeRoot === undefined) {
|
|
70
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
71
|
+
if (PQP.TaskUtils.isOk(triedParse) || !PQP.Parser.ParseError.isParseError(triedParse.error)) {
|
|
123
72
|
return [];
|
|
124
73
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
74
|
+
const error = triedParse.error;
|
|
75
|
+
const innerError = error.innerError;
|
|
76
|
+
const message = error.message;
|
|
77
|
+
const parseContextState = error.state.contextState;
|
|
78
|
+
let maybeErrorToken;
|
|
79
|
+
if ((innerError instanceof PQP.Parser.ParseError.ExpectedAnyTokenKindError ||
|
|
80
|
+
innerError instanceof PQP.Parser.ParseError.ExpectedTokenKindError) &&
|
|
81
|
+
innerError.maybeFoundToken !== undefined) {
|
|
82
|
+
maybeErrorToken = innerError.maybeFoundToken.token;
|
|
128
83
|
}
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
84
|
+
else if (innerError instanceof PQP.Parser.ParseError.InvalidPrimitiveTypeError) {
|
|
85
|
+
maybeErrorToken = innerError.token;
|
|
86
|
+
}
|
|
87
|
+
else if (innerError instanceof PQP.Parser.ParseError.UnterminatedSequence) {
|
|
88
|
+
maybeErrorToken = innerError.startToken;
|
|
89
|
+
}
|
|
90
|
+
else if (innerError instanceof PQP.Parser.ParseError.UnusedTokensRemainError) {
|
|
91
|
+
maybeErrorToken = innerError.firstUnusedToken;
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
maybeErrorToken = undefined;
|
|
95
|
+
}
|
|
96
|
+
let range;
|
|
97
|
+
if (maybeErrorToken !== undefined) {
|
|
98
|
+
range = {
|
|
99
|
+
start: {
|
|
100
|
+
line: maybeErrorToken.positionStart.lineNumber,
|
|
101
|
+
character: maybeErrorToken.positionStart.lineCodeUnit,
|
|
102
|
+
},
|
|
103
|
+
end: {
|
|
104
|
+
line: maybeErrorToken.positionEnd.lineNumber,
|
|
105
|
+
character: maybeErrorToken.positionEnd.lineCodeUnit,
|
|
106
|
+
},
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
const maybeRoot = parseContextState.maybeRoot;
|
|
111
|
+
if (maybeRoot === undefined) {
|
|
112
|
+
return [];
|
|
113
|
+
}
|
|
114
|
+
const maybeLeaf = yield parser_1.NodeIdMapUtils.maybeRightMostLeaf(error.state.contextState.nodeIdMapCollection, maybeRoot.id);
|
|
115
|
+
if (maybeLeaf === undefined) {
|
|
116
|
+
return [];
|
|
117
|
+
}
|
|
118
|
+
const leafTokenRange = maybeLeaf.tokenRange;
|
|
119
|
+
range = {
|
|
120
|
+
start: {
|
|
121
|
+
line: leafTokenRange.positionStart.lineNumber,
|
|
122
|
+
character: leafTokenRange.positionStart.lineCodeUnit,
|
|
123
|
+
},
|
|
124
|
+
end: {
|
|
125
|
+
line: leafTokenRange.positionEnd.lineNumber,
|
|
126
|
+
character: leafTokenRange.positionEnd.lineCodeUnit,
|
|
127
|
+
},
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
return [
|
|
131
|
+
{
|
|
132
|
+
code: diagnosticErrorCode_1.DiagnosticErrorCode.ParseError,
|
|
133
|
+
message,
|
|
134
|
+
range,
|
|
135
|
+
severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
|
|
136
|
+
source: validationSettings === null || validationSettings === void 0 ? void 0 : validationSettings.source,
|
|
138
137
|
},
|
|
139
|
-
|
|
140
|
-
}
|
|
141
|
-
return [
|
|
142
|
-
{
|
|
143
|
-
code: diagnosticErrorCode_1.DiagnosticErrorCode.ParseError,
|
|
144
|
-
message: message,
|
|
145
|
-
range: range,
|
|
146
|
-
severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
|
|
147
|
-
source: validationSettings === null || validationSettings === void 0 ? void 0 : validationSettings.source,
|
|
148
|
-
},
|
|
149
|
-
];
|
|
138
|
+
];
|
|
139
|
+
});
|
|
150
140
|
}
|
|
151
141
|
//# sourceMappingURL=validateLexAndParse.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateLexAndParse.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateLexAndParse.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"validateLexAndParse.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateLexAndParse.ts"],"names":[],"mappings":"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"}
|
package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js
CHANGED
|
@@ -1,21 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
|
-
var __assign = (this && this.__assign) || function () {
|
|
5
|
-
__assign = Object.assign || function(t) {
|
|
6
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
7
|
-
s = arguments[i];
|
|
8
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
9
|
-
t[p] = s[p];
|
|
10
|
-
}
|
|
11
|
-
return t;
|
|
12
|
-
};
|
|
13
|
-
return __assign.apply(this, arguments);
|
|
14
|
-
};
|
|
15
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
5
|
exports.createValidationSettings = void 0;
|
|
17
6
|
function createValidationSettings(inspectionSettings, source, checkForDuplicateIdentifiers, checkInvokeExpressions) {
|
|
18
|
-
return
|
|
7
|
+
return Object.assign(Object.assign({}, inspectionSettings), { checkForDuplicateIdentifiers: checkForDuplicateIdentifiers !== null && checkForDuplicateIdentifiers !== void 0 ? checkForDuplicateIdentifiers : true, checkInvokeExpressions: checkInvokeExpressions !== null && checkInvokeExpressions !== void 0 ? checkInvokeExpressions : true, source });
|
|
19
8
|
}
|
|
20
9
|
exports.createValidationSettings = createValidationSettings;
|
|
21
10
|
//# sourceMappingURL=validationSettingsUtils.js.map
|
package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validationSettingsUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/validate/validationSettings/validationSettingsUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"validationSettingsUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/validate/validationSettings/validationSettingsUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,SAAgB,wBAAwB,CACpC,kBAAsC,EACtC,MAAc,EACd,4BAAsC,EACtC,sBAAgC;IAEhC,uCACO,kBAAkB,KACrB,4BAA4B,EAAE,4BAA4B,aAA5B,4BAA4B,cAA5B,4BAA4B,GAAI,IAAI,EAClE,sBAAsB,EAAE,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,IAAI,EACtD,MAAM,IACR;AACN,CAAC;AAZD,4DAYC"}
|
|
@@ -1,19 +1,9 @@
|
|
|
1
1
|
import * as PQP from "@microsoft/powerquery-parser";
|
|
2
|
-
import { Position } from "vscode-languageserver-textdocument";
|
|
3
2
|
import { Inspection } from "..";
|
|
4
|
-
export declare type InspectionTask = Inspection.Inspection & {
|
|
5
|
-
readonly stage: "Inspection";
|
|
6
|
-
readonly version: number;
|
|
7
|
-
readonly parseState: PQP.Parser.ParseState;
|
|
8
|
-
};
|
|
9
|
-
export declare type CacheItem = LexCacheItem | ParseCacheItem | InspectionCacheItem;
|
|
10
|
-
export declare type LexCacheItem = PQP.Task.TriedLexTask;
|
|
11
|
-
export declare type ParseCacheItem = LexCacheItem | PQP.Task.TriedParseTask;
|
|
12
|
-
export declare type InspectionCacheItem = ParseCacheItem | InspectionTask | undefined;
|
|
13
3
|
export interface CacheCollection {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
readonly
|
|
4
|
+
maybeLex: Promise<PQP.Task.TriedLexTask> | undefined;
|
|
5
|
+
maybeParse: Promise<PQP.Task.TriedParseTask | undefined> | undefined;
|
|
6
|
+
readonly inspectionByPosition: Map<string, Promise<Inspection.Inspected> | undefined>;
|
|
17
7
|
readonly typeCache: Inspection.TypeCache;
|
|
18
8
|
readonly version: number;
|
|
19
9
|
}
|