@microsoft/powerquery-language-services 0.2.12 → 0.2.18
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 +1 -1
- package/lib/powerquery-language-services/analysis/analysisBase.d.ts +1 -0
- package/lib/powerquery-language-services/analysis/analysisBase.js +35 -26
- package/lib/powerquery-language-services/analysis/analysisBase.js.map +1 -1
- package/lib/powerquery-language-services/analysis/analysisSettings.d.ts +3 -2
- package/lib/powerquery-language-services/analysis/analysisUtils.d.ts +1 -1
- package/lib/powerquery-language-services/analysis/documentAnalysis.d.ts +1 -1
- package/lib/powerquery-language-services/commonTypes.d.ts +1 -2
- package/lib/powerquery-language-services/commonTypes.js +0 -2
- package/lib/powerquery-language-services/commonTypes.js.map +1 -1
- package/lib/powerquery-language-services/documentSymbols.js +13 -9
- 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 +1 -1
- package/lib/powerquery-language-services/formatter.js.map +1 -1
- package/lib/powerquery-language-services/index.d.ts +2 -0
- package/lib/powerquery-language-services/index.js +3 -1
- package/lib/powerquery-language-services/index.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js +9 -5
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js +26 -15
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItem.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js +15 -18
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js +20 -16
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js.map +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 +15 -11
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js.map +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 +3 -4
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js +7 -3
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js +13 -7
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/common.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 +8 -6
- package/lib/powerquery-language-services/inspection/autocomplete/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/expectedType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/externalType/externalTypeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js +7 -4
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js +4 -4
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/jaroWinkler.js +0 -2
- package/lib/powerquery-language-services/inspection/jaroWinkler.js.map +1 -1
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js +41 -9
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/task.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/task.js +7 -7
- package/lib/powerquery-language-services/inspection/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.d.ts +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js +63 -47
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js +7 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js +8 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js +9 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldProjection.js +20 -11
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldProjection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSelector.js +26 -11
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSelector.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js +7 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js +13 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js +11 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js +12 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js +12 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js +23 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js +19 -12
- 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 +8 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js +17 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.d.ts +2 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js +22 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js +17 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js +8 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.d.ts +2 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js +8 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js +15 -9
- 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 +13 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js +11 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js +13 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js +50 -39
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js +12 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js +30 -17
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/task.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/task.js +22 -8
- package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
- package/lib/powerquery-language-services/inspectionUtils.d.ts +1 -1
- package/lib/powerquery-language-services/inspectionUtils.js +1 -3
- package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/library.d.ts +1 -1
- package/lib/powerquery-language-services/library/libraryUtils.d.ts +1 -1
- package/lib/powerquery-language-services/library/libraryUtils.js +3 -3
- package/lib/powerquery-language-services/library/libraryUtils.js.map +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.bg-BG.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.ca-ES.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.cs-CZ.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.da-DK.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.de-DE.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.el-GR.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.es-ES.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.et-EE.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.eu-ES.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.fi-FI.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.fr-FR.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.gl-ES.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.hi-IN.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.hr-HR.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.hu-HU.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.id-ID.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.it-IT.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.ja-JP.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.kk-KZ.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.ko-KR.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.lt-LT.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.lv-LV.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.ms-MY.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.nb-NO.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.nl-NL.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.pl-PL.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.pt-BR.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.pt-PT.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.ro-RO.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.ru-RU.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.sk-SK.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.sl-SI.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.sr-Cyrl-RS.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.sr-Latn-RS.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.sv-SE.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.th-TH.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.tr-TR.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.uk-UA.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.vi-VN.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.zh-CN.json +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.zh-TW.json +1 -1
- package/lib/powerquery-language-services/localization/templates.d.ts +1 -1
- package/lib/powerquery-language-services/localization/templates.js +2 -2
- package/lib/powerquery-language-services/localization/templates.js.map +1 -1
- package/lib/powerquery-language-services/positionUtils.d.ts +1 -1
- package/lib/powerquery-language-services/positionUtils.js +1 -1
- package/lib/powerquery-language-services/positionUtils.js.map +1 -1
- package/lib/powerquery-language-services/providers/commonTypes.d.ts +1 -1
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.d.ts +2 -2
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js +9 -5
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/librarySymbolProvider.d.ts +2 -2
- package/lib/powerquery-language-services/providers/librarySymbolProvider.js +3 -7
- package/lib/powerquery-language-services/providers/librarySymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentSymbolProvider.d.ts +2 -2
- package/lib/powerquery-language-services/providers/localDocumentSymbolProvider.js +13 -15
- package/lib/powerquery-language-services/providers/localDocumentSymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/nullSymbolProvider.d.ts +2 -2
- package/lib/powerquery-language-services/providers/nullSymbolProvider.js +0 -2
- package/lib/powerquery-language-services/providers/nullSymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/trace.d.ts +12 -0
- package/lib/powerquery-language-services/trace.js +5 -0
- package/lib/powerquery-language-services/trace.js.map +1 -0
- package/lib/powerquery-language-services/traceUtils.d.ts +14 -0
- package/lib/powerquery-language-services/traceUtils.js +21 -0
- package/lib/powerquery-language-services/traceUtils.js.map +1 -0
- package/lib/powerquery-language-services/validate/validate.js +12 -7
- 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 +15 -11
- 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 +11 -7
- 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 +11 -7
- 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 +4 -2
- package/lib/powerquery-language-services/validate/validateLexAndParse.js.map +1 -1
- package/lib/powerquery-language-services/validate/validationSettings/validationSettings.d.ts +1 -0
- package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.d.ts +1 -1
- package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js +2 -2
- package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js.map +1 -1
- package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.d.ts +1 -1
- package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.js.map +1 -1
- package/package.json +24 -26
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Hover, SignatureHelp } from "vscode-languageserver-types";
|
|
2
|
-
import { Inspection } from "..";
|
|
3
2
|
import { IDisposable } from "../commonTypes";
|
|
3
|
+
import { Inspection } from "..";
|
|
4
4
|
export interface Analysis extends IDisposable {
|
|
5
5
|
getAutocompleteItems(): Promise<Inspection.AutocompleteItem[]>;
|
|
6
6
|
getHover(): Promise<Hover>;
|
|
@@ -18,6 +18,7 @@ export declare abstract class AnalysisBase implements Analysis {
|
|
|
18
18
|
abstract dispose(): void;
|
|
19
19
|
protected abstract getLexerState(): WorkspaceCache.LexCacheItem;
|
|
20
20
|
protected abstract getText(range?: Range): string;
|
|
21
|
+
private static promiseWithTimeout;
|
|
21
22
|
private static resolveProviders;
|
|
22
23
|
private static createAutocompleteItemCalls;
|
|
23
24
|
private static createHoverCalls;
|
|
@@ -68,9 +68,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
68
68
|
exports.AnalysisBase = void 0;
|
|
69
69
|
var powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
70
70
|
var InspectionUtils = require("../inspectionUtils");
|
|
71
|
+
var inspection_1 = require("../inspection");
|
|
71
72
|
var __1 = require("..");
|
|
72
73
|
var commonTypes_1 = require("../commonTypes");
|
|
73
|
-
var inspection_1 = require("../inspection");
|
|
74
74
|
var providers_1 = require("../providers");
|
|
75
75
|
var workspaceCache_1 = require("../workspaceCache");
|
|
76
76
|
var AnalysisBase = /** @class */ (function () {
|
|
@@ -108,11 +108,7 @@ var AnalysisBase = /** @class */ (function () {
|
|
|
108
108
|
tokenKind: maybeToken.kind,
|
|
109
109
|
};
|
|
110
110
|
}
|
|
111
|
-
return [4 /*yield*/, Promise.all(AnalysisBase.createAutocompleteItemCalls(context, [
|
|
112
|
-
this.languageAutocompleteItemProvider,
|
|
113
|
-
this.librarySymbolProvider,
|
|
114
|
-
this.localDocumentSymbolProvider,
|
|
115
|
-
]))];
|
|
111
|
+
return [4 /*yield*/, Promise.all(AnalysisBase.createAutocompleteItemCalls(context, [this.languageAutocompleteItemProvider, this.librarySymbolProvider, this.localDocumentSymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS))];
|
|
116
112
|
case 1:
|
|
117
113
|
_a = __read.apply(void 0, [_f.sent(), 3]), languageResponse = _a[0], libraryResponse = _a[1], localDocumentResponse = _a[2];
|
|
118
114
|
partial = [];
|
|
@@ -168,7 +164,7 @@ var AnalysisBase = /** @class */ (function () {
|
|
|
168
164
|
identifier: identifierToken.literal,
|
|
169
165
|
};
|
|
170
166
|
// Result priority is based on the order of the symbol providers
|
|
171
|
-
return [2 /*return*/, AnalysisBase.resolveProviders(AnalysisBase.createHoverCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider]), commonTypes_1.EmptyHover)];
|
|
167
|
+
return [2 /*return*/, AnalysisBase.resolveProviders(AnalysisBase.createHoverCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptyHover)];
|
|
172
168
|
});
|
|
173
169
|
});
|
|
174
170
|
};
|
|
@@ -189,24 +185,36 @@ var AnalysisBase = /** @class */ (function () {
|
|
|
189
185
|
return [2 /*return*/, commonTypes_1.EmptySignatureHelp];
|
|
190
186
|
}
|
|
191
187
|
// Result priority is based on the order of the symbol providers
|
|
192
|
-
return [2 /*return*/, AnalysisBase.resolveProviders(AnalysisBase.createSignatureHelpCalls(context, [
|
|
193
|
-
this.localDocumentSymbolProvider,
|
|
194
|
-
this.librarySymbolProvider,
|
|
195
|
-
]), commonTypes_1.EmptySignatureHelp)];
|
|
188
|
+
return [2 /*return*/, AnalysisBase.resolveProviders(AnalysisBase.createSignatureHelpCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptySignatureHelp)];
|
|
196
189
|
});
|
|
197
190
|
});
|
|
198
191
|
};
|
|
192
|
+
AnalysisBase.promiseWithTimeout = function (promise, timeoutReturnValue, timeoutInMS) {
|
|
193
|
+
if (timeoutInMS !== undefined) {
|
|
194
|
+
// TODO: Enabling trace entry when timeout occurs
|
|
195
|
+
return Promise.race([
|
|
196
|
+
promise,
|
|
197
|
+
new Promise(function (resolve) {
|
|
198
|
+
return setTimeout(function () {
|
|
199
|
+
resolve(timeoutReturnValue);
|
|
200
|
+
}, timeoutInMS);
|
|
201
|
+
}),
|
|
202
|
+
]);
|
|
203
|
+
}
|
|
204
|
+
return promise;
|
|
205
|
+
};
|
|
199
206
|
AnalysisBase.resolveProviders = function (calls, defaultReturnValue) {
|
|
200
207
|
return __awaiter(this, void 0, void 0, function () {
|
|
201
|
-
var results, i;
|
|
208
|
+
var results, i, result;
|
|
202
209
|
return __generator(this, function (_a) {
|
|
203
210
|
switch (_a.label) {
|
|
204
211
|
case 0: return [4 /*yield*/, Promise.all(calls)];
|
|
205
212
|
case 1:
|
|
206
213
|
results = _a.sent();
|
|
207
|
-
for (i = 0; i < results.length; i
|
|
208
|
-
|
|
209
|
-
|
|
214
|
+
for (i = 0; i < results.length; i += 1) {
|
|
215
|
+
result = results[i];
|
|
216
|
+
if (result !== null) {
|
|
217
|
+
return [2 /*return*/, result];
|
|
210
218
|
}
|
|
211
219
|
}
|
|
212
220
|
return [2 /*return*/, defaultReturnValue];
|
|
@@ -214,30 +222,31 @@ var AnalysisBase = /** @class */ (function () {
|
|
|
214
222
|
});
|
|
215
223
|
});
|
|
216
224
|
};
|
|
217
|
-
AnalysisBase.createAutocompleteItemCalls = function (context, providers) {
|
|
225
|
+
AnalysisBase.createAutocompleteItemCalls = function (context, providers, timeoutInMS) {
|
|
226
|
+
var _this = this;
|
|
218
227
|
// TODO: add tracing to the catch case
|
|
219
228
|
return providers.map(function (provider) {
|
|
220
|
-
return provider.getAutocompleteItems(context).catch(function () {
|
|
229
|
+
return _this.promiseWithTimeout(provider.getAutocompleteItems(context).catch(function () {
|
|
221
230
|
return [];
|
|
222
|
-
});
|
|
231
|
+
}), [], timeoutInMS);
|
|
223
232
|
});
|
|
224
233
|
};
|
|
225
|
-
AnalysisBase.createHoverCalls = function (context, providers) {
|
|
234
|
+
AnalysisBase.createHoverCalls = function (context, providers, timeoutInMS) {
|
|
235
|
+
var _this = this;
|
|
226
236
|
// TODO: add tracing to the catch case
|
|
227
237
|
return providers.map(function (provider) {
|
|
228
|
-
return provider.getHover(context).catch(function () {
|
|
229
|
-
// tslint:disable-next-line: no-null-keyword
|
|
238
|
+
return _this.promiseWithTimeout(provider.getHover(context).catch(function () {
|
|
230
239
|
return null;
|
|
231
|
-
});
|
|
240
|
+
}), null, timeoutInMS);
|
|
232
241
|
});
|
|
233
242
|
};
|
|
234
|
-
AnalysisBase.createSignatureHelpCalls = function (context, providers) {
|
|
243
|
+
AnalysisBase.createSignatureHelpCalls = function (context, providers, timeoutInMS) {
|
|
244
|
+
var _this = this;
|
|
235
245
|
// TODO: add tracing to the catch case
|
|
236
246
|
return providers.map(function (provider) {
|
|
237
|
-
return provider.getSignatureHelp(context).catch(function () {
|
|
238
|
-
// tslint:disable-next-line: no-null-keyword
|
|
247
|
+
return _this.promiseWithTimeout(provider.getSignatureHelp(context).catch(function () {
|
|
239
248
|
return null;
|
|
240
|
-
});
|
|
249
|
+
}), null, timeoutInMS);
|
|
241
250
|
});
|
|
242
251
|
};
|
|
243
252
|
AnalysisBase.isValidHoverIdentifier = function (activeNode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { InspectionSettings } from "../inspectionSettings";
|
|
2
|
-
import { ILibrary } from "../library/library";
|
|
3
1
|
import { AutocompleteItemProvider, ISymbolProvider } from "../providers/commonTypes";
|
|
2
|
+
import { ILibrary } from "../library/library";
|
|
3
|
+
import { InspectionSettings } from "../inspectionSettings";
|
|
4
4
|
import { WorkspaceCache } from "../workspaceCache";
|
|
5
5
|
export interface AnalysisSettings {
|
|
6
6
|
readonly createInspectionSettingsFn: () => InspectionSettings;
|
|
@@ -9,4 +9,5 @@ export interface AnalysisSettings {
|
|
|
9
9
|
readonly maybeCreateLanguageAutocompleteItemProviderFn?: () => AutocompleteItemProvider;
|
|
10
10
|
readonly maybeCreateLibrarySymbolProviderFn?: (library: ILibrary) => ISymbolProvider;
|
|
11
11
|
readonly maybeCreateLocalDocumentSymbolProviderFn?: (library: ILibrary, maybeTriedInspection: WorkspaceCache.CacheItem | undefined, createInspectionSettingsFn: () => InspectionSettings) => ISymbolProvider;
|
|
12
|
+
readonly symbolProviderTimeoutInMS?: number;
|
|
12
13
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { TextDocument } from "vscode-languageserver-textdocument";
|
|
2
1
|
import type { Position } from "vscode-languageserver-types";
|
|
2
|
+
import type { TextDocument } from "vscode-languageserver-textdocument";
|
|
3
3
|
import { Analysis } from "./analysis";
|
|
4
4
|
import { AnalysisSettings } from "./analysisSettings";
|
|
5
5
|
export declare function createAnalysis(document: TextDocument, analysisSettings: AnalysisSettings, position: Position): Analysis;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { TextDocument } from "vscode-languageserver-textdocument";
|
|
2
1
|
import type { Position, Range } from "vscode-languageserver-types";
|
|
2
|
+
import type { TextDocument } from "vscode-languageserver-textdocument";
|
|
3
3
|
import { WorkspaceCache } from "../workspaceCache";
|
|
4
4
|
import { AnalysisBase } from "./analysisBase";
|
|
5
5
|
import { AnalysisSettings } from "./analysisSettings";
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
+
import { CompletionItem, CompletionItemKind, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DocumentSymbol, Hover, Position, Range, SignatureHelp, SymbolKind } from "vscode-languageserver-types";
|
|
1
2
|
import type { DocumentUri, TextDocument, TextDocumentContentChangeEvent } from "vscode-languageserver-textdocument";
|
|
2
|
-
import type { CompletionItem, Diagnostic, DiagnosticRelatedInformation, DocumentSymbol, Hover, Position, Range, SignatureHelp } from "vscode-languageserver-types";
|
|
3
|
-
import { CompletionItemKind, DiagnosticSeverity, SymbolKind } from "vscode-languageserver-types";
|
|
4
3
|
export type { CompletionItem, Diagnostic, DiagnosticRelatedInformation, DocumentSymbol, DocumentUri, Hover, Position, Range, SignatureHelp, TextDocument, TextDocumentContentChangeEvent, };
|
|
5
4
|
export { CompletionItemKind, DiagnosticSeverity, SymbolKind };
|
|
6
5
|
export interface IDisposable {
|
|
@@ -13,9 +13,7 @@ exports.EmptyHover = {
|
|
|
13
13
|
};
|
|
14
14
|
exports.EmptySignatureHelp = {
|
|
15
15
|
signatures: [],
|
|
16
|
-
// tslint:disable-next-line: no-null-keyword
|
|
17
16
|
activeParameter: null,
|
|
18
|
-
// tslint:disable-next-line: no-null-keyword
|
|
19
17
|
activeSignature: null,
|
|
20
18
|
};
|
|
21
19
|
//# sourceMappingURL=commonTypes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../../src/powerquery-language-services/commonTypes.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;
|
|
1
|
+
{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../../src/powerquery-language-services/commonTypes.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,2EAYqC;AAgB5B,mGA1BL,gDAAkB,OA0BK;AAAE,mGAvBzB,gDAAkB,OAuByB;AAAE,2FAjB7C,wCAAU,OAiB6C;AAM9C,QAAA,UAAU,GAAU;IAC7B,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,EAAE;CACf,CAAC;AAEW,QAAA,kBAAkB,GAAkB;IAC7C,UAAU,EAAE,EAAE;IACd,eAAe,EAAE,IAAI;IACrB,eAAe,EAAE,IAAI;CACxB,CAAC"}
|
|
@@ -17,10 +17,14 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
17
17
|
}
|
|
18
18
|
return ar;
|
|
19
19
|
};
|
|
20
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
21
|
-
for (var i = 0,
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
21
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
22
|
+
if (ar || !(i in from)) {
|
|
23
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
24
|
+
ar[i] = from[i];
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
24
28
|
};
|
|
25
29
|
var __values = (this && this.__values) || function(o) {
|
|
26
30
|
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
@@ -60,7 +64,7 @@ function addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbol
|
|
|
60
64
|
var e_1, _a;
|
|
61
65
|
var _b;
|
|
62
66
|
var identifierPairedExpressionIds = (_b = nodeIdMapCollection.idsByNodeKind.get("IdentifierPairedExpression" /* IdentifierPairedExpression */)) !== null && _b !== void 0 ? _b : new Set();
|
|
63
|
-
var identifierPairedExpressionsXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, __spreadArray([], __read(identifierPairedExpressionIds.values())));
|
|
67
|
+
var identifierPairedExpressionsXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, __spreadArray([], __read(identifierPairedExpressionIds.values()), false));
|
|
64
68
|
try {
|
|
65
69
|
for (var identifierPairedExpressionsXorNodes_1 = __values(identifierPairedExpressionsXorNodes), identifierPairedExpressionsXorNodes_1_1 = identifierPairedExpressionsXorNodes_1.next(); !identifierPairedExpressionsXorNodes_1_1.done; identifierPairedExpressionsXorNodes_1_1 = identifierPairedExpressionsXorNodes_1.next()) {
|
|
66
70
|
var xorNode = identifierPairedExpressionsXorNodes_1_1.value;
|
|
@@ -84,7 +88,7 @@ function addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbol
|
|
|
84
88
|
function addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById) {
|
|
85
89
|
var e_2, _a;
|
|
86
90
|
var _b, _c;
|
|
87
|
-
var recordIds = __spreadArray(__spreadArray([], __read(((_b = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _b !== void 0 ? _b : new Set()).values())), __read(((_c = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _c !== void 0 ? _c : new Set()).values()));
|
|
91
|
+
var recordIds = __spreadArray(__spreadArray([], __read(((_b = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _b !== void 0 ? _b : new Set()).values()), false), __read(((_c = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _c !== void 0 ? _c : new Set()).values()), false);
|
|
88
92
|
var recordXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, recordIds);
|
|
89
93
|
try {
|
|
90
94
|
for (var recordXorNodes_1 = __values(recordXorNodes), recordXorNodes_1_1 = recordXorNodes_1.next(); !recordXorNodes_1_1.done; recordXorNodes_1_1 = recordXorNodes_1.next()) {
|
|
@@ -99,7 +103,7 @@ function addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById)
|
|
|
99
103
|
if (parentSymbol && parentSymbol.kind === commonTypes_1.SymbolKind.Struct) {
|
|
100
104
|
var fieldSymbols = InspectionUtils.getSymbolsForRecord(asAst);
|
|
101
105
|
if (fieldSymbols.length > 0) {
|
|
102
|
-
addDocumentSymbols.apply(void 0, __spreadArray([nodeIdMapCollection, parentSymbolById, asAst.id, currentSymbols], __read(fieldSymbols)));
|
|
106
|
+
addDocumentSymbols.apply(void 0, __spreadArray([nodeIdMapCollection, parentSymbolById, asAst.id, currentSymbols], __read(fieldSymbols), false));
|
|
103
107
|
}
|
|
104
108
|
}
|
|
105
109
|
}
|
|
@@ -123,11 +127,11 @@ function addDocumentSymbols(nodeIdMapCollection, parentSymbolById, nodeId, curre
|
|
|
123
127
|
if (!parentSymbol.children) {
|
|
124
128
|
parentSymbol.children = [];
|
|
125
129
|
}
|
|
126
|
-
(_a = parentSymbol.children).push.apply(_a, __spreadArray([], __read(newSymbols)));
|
|
130
|
+
(_a = parentSymbol.children).push.apply(_a, __spreadArray([], __read(newSymbols), false));
|
|
127
131
|
return;
|
|
128
132
|
}
|
|
129
133
|
// Add to the top level
|
|
130
|
-
currentSymbols.push.apply(currentSymbols, __spreadArray([], __read(newSymbols)));
|
|
134
|
+
currentSymbols.push.apply(currentSymbols, __spreadArray([], __read(newSymbols), false));
|
|
131
135
|
}
|
|
132
136
|
function findParentSymbol(nodeIdMapCollection, parentSymbolById, nodeId) {
|
|
133
137
|
// Get parent for current node
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../src/powerquery-language-services/documentSymbols.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../src/powerquery-language-services/documentSymbols.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { TextDocument } from "vscode-languageserver-textdocument";
|
|
2
1
|
import { FormattingOptions, TextEdit } from "vscode-languageserver-types";
|
|
2
|
+
import { TextDocument } from "vscode-languageserver-textdocument";
|
|
3
3
|
export declare function tryFormat(document: TextDocument, formattingOptions: FormattingOptions, locale: string): TextEdit[];
|
|
@@ -16,8 +16,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
exports.tryFormat = void 0;
|
|
17
17
|
var PQF = require("@microsoft/powerquery-formatter");
|
|
18
18
|
var PQP = require("@microsoft/powerquery-parser");
|
|
19
|
-
var powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
20
19
|
var vscode_languageserver_types_1 = require("vscode-languageserver-types");
|
|
20
|
+
var powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
21
21
|
function tryFormat(document, formattingOptions, locale) {
|
|
22
22
|
var indentationLiteral;
|
|
23
23
|
if (formattingOptions.insertSpaces) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../src/powerquery-language-services/formatter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAElC,qDAAuD;AACvD,kDAAoD;
|
|
1
|
+
{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../src/powerquery-language-services/formatter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAElC,qDAAuD;AACvD,kDAAoD;AACpD,2EAAiF;AACjF,kEAA2D;AAG3D,SAAgB,SAAS,CAAC,QAAsB,EAAE,iBAAoC,EAAE,MAAc;IAClG,IAAI,kBAA0C,CAAC;IAC/C,IAAI,iBAAiB,CAAC,YAAY,EAAE;QAChC,kBAAkB,uBAAiC,CAAC;KACvD;SAAM;QACH,kBAAkB,iBAA6B,CAAC;KACnD;IAED,IAAM,cAAc,yBACb,GAAG,CAAC,eAAe,KACtB,MAAM,QAAA,EACN,kBAAkB,oBAAA,GACrB,CAAC;IACF,IAAM,WAAW,GAAoB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAEvF,IAAI,+BAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;QAC/B,OAAO,CAAC,sCAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;KAC7E;IACD,0CAA0C;SACrC,IAAI,GAAG,CAAC,WAAW,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;QACvD,MAAM,WAAW,CAAC,KAAK,CAAC;KAC3B;IACD,mEAAmE;SAC9D;QACD,OAAO,EAAE,CAAC;KACb;AACL,CAAC;AA1BD,8BA0BC;AAED,0CAA0C;AAC1C,SAAS,iBAAiB,CAAC,QAAsB;IAC7C,OAAO;QACH,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7B,GAAG,EAAE;YACD,IAAI,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC;YAC5B,SAAS,EAAE,MAAM,CAAC,SAAS;SAC9B;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -3,6 +3,7 @@ export * as CommonTypesUtils from "./commonTypesUtils";
|
|
|
3
3
|
export * as Inspection from "./inspection";
|
|
4
4
|
export * as InspectionUtils from "./inspectionUtils";
|
|
5
5
|
export * as PositionUtils from "./positionUtils";
|
|
6
|
+
export * as TraceUtils from "./traceUtils";
|
|
6
7
|
export * from "./analysis";
|
|
7
8
|
export * from "./commonTypes";
|
|
8
9
|
export * from "./diagnosticErrorCode";
|
|
@@ -11,6 +12,7 @@ export * from "./formatter";
|
|
|
11
12
|
export * from "./inspectionSettings";
|
|
12
13
|
export * from "./library";
|
|
13
14
|
export * from "./providers";
|
|
15
|
+
export * from "./trace";
|
|
14
16
|
export * from "./validate";
|
|
15
17
|
export * from "./workspaceCache";
|
|
16
18
|
export declare function createTextDocument(id: string, version: number, content: string): TextDocument;
|
|
@@ -12,13 +12,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
12
12
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.documentClosed = exports.documentUpdated = exports.createTextDocument = exports.PositionUtils = exports.InspectionUtils = exports.Inspection = exports.CommonTypesUtils = void 0;
|
|
15
|
+
exports.documentClosed = exports.documentUpdated = exports.createTextDocument = exports.TraceUtils = exports.PositionUtils = exports.InspectionUtils = exports.Inspection = exports.CommonTypesUtils = void 0;
|
|
16
16
|
var vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
|
|
17
17
|
var workspaceCache_1 = require("./workspaceCache");
|
|
18
18
|
exports.CommonTypesUtils = require("./commonTypesUtils");
|
|
19
19
|
exports.Inspection = require("./inspection");
|
|
20
20
|
exports.InspectionUtils = require("./inspectionUtils");
|
|
21
21
|
exports.PositionUtils = require("./positionUtils");
|
|
22
|
+
exports.TraceUtils = require("./traceUtils");
|
|
22
23
|
__exportStar(require("./analysis"), exports);
|
|
23
24
|
__exportStar(require("./commonTypes"), exports);
|
|
24
25
|
__exportStar(require("./diagnosticErrorCode"), exports);
|
|
@@ -27,6 +28,7 @@ __exportStar(require("./formatter"), exports);
|
|
|
27
28
|
__exportStar(require("./inspectionSettings"), exports);
|
|
28
29
|
__exportStar(require("./library"), exports);
|
|
29
30
|
__exportStar(require("./providers"), exports);
|
|
31
|
+
__exportStar(require("./trace"), exports);
|
|
30
32
|
__exportStar(require("./validate"), exports);
|
|
31
33
|
__exportStar(require("./workspaceCache"), exports);
|
|
32
34
|
function createTextDocument(id, version, content) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/powerquery-language-services/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;AAElC,yFAAkG;AAClG,mDAAuD;AAEvD,yDAAuD;AACvD,6CAA2C;AAC3C,uDAAqD;AACrD,mDAAiD;AACjD,6CAA2B;AAC3B,gDAA8B;AAC9B,wDAAsC;AACtC,oDAAkC;AAClC,8CAA4B;AAC5B,uDAAqC;AACrC,4CAA0B;AAC1B,8CAA4B;AAC5B,6CAA2B;AAC3B,mDAAiC;AAEjC,SAAgB,kBAAkB,CAAC,EAAU,EAAE,OAAe,EAAE,OAAe;IAC3E,OAAO,iDAAY,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC;AAFD,gDAEC;AAED,SAAgB,eAAe,CAC3B,QAAsB,EACtB,OAAsD,EACtD,OAAe;IAEf,oCAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC3D,CAAC;AAND,0CAMC;AAED,SAAgB,cAAc,CAAC,QAAsB;IACjD,oCAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAFD,wCAEC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/powerquery-language-services/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;AAElC,yFAAkG;AAClG,mDAAuD;AAEvD,yDAAuD;AACvD,6CAA2C;AAC3C,uDAAqD;AACrD,mDAAiD;AACjD,6CAA2C;AAC3C,6CAA2B;AAC3B,gDAA8B;AAC9B,wDAAsC;AACtC,oDAAkC;AAClC,8CAA4B;AAC5B,uDAAqC;AACrC,4CAA0B;AAC1B,8CAA4B;AAC5B,0CAAwB;AACxB,6CAA2B;AAC3B,mDAAiC;AAEjC,SAAgB,kBAAkB,CAAC,EAAU,EAAE,OAAe,EAAE,OAAe;IAC3E,OAAO,iDAAY,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC;AAFD,gDAEC;AAED,SAAgB,eAAe,CAC3B,QAAsB,EACtB,OAAsD,EACtD,OAAe;IAEf,oCAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC3D,CAAC;AAND,0CAMC;AAED,SAAgB,cAAc,CAAC,QAAsB;IACjD,oCAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAFD,wCAEC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
|
-
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
2
|
import type { Position } from "vscode-languageserver-types";
|
|
3
|
+
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
4
4
|
export declare type TMaybeActiveNode = ActiveNode | OutOfBoundPosition;
|
|
5
5
|
export interface IActiveNode {
|
|
6
6
|
readonly kind: ActiveNodeKind;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
1
|
import { NodeIdMap, TXorNode, XorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
2
|
+
import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
3
3
|
import type { Position } from "vscode-languageserver-types";
|
|
4
4
|
import { ActiveNode, ActiveNodeLeafKind, OutOfBoundPosition, TMaybeActiveNode } from "./activeNode";
|
|
5
5
|
export declare function maybeActiveNode(nodeIdMapCollection: NodeIdMap.Collection, position: Position): TMaybeActiveNode;
|
|
@@ -17,10 +17,14 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
17
17
|
}
|
|
18
18
|
return ar;
|
|
19
19
|
};
|
|
20
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
21
|
-
for (var i = 0,
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
21
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
22
|
+
if (ar || !(i in from)) {
|
|
23
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
24
|
+
ar[i] = from[i];
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
24
28
|
};
|
|
25
29
|
var __values = (this && this.__values) || function(o) {
|
|
26
30
|
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
@@ -147,7 +151,7 @@ var ShiftRightConstantKinds = __spreadArray([
|
|
|
147
151
|
"]" /* RightBracket */,
|
|
148
152
|
")" /* RightParenthesis */,
|
|
149
153
|
";" /* Semicolon */
|
|
150
|
-
], __read(DrilldownConstantKind));
|
|
154
|
+
], __read(DrilldownConstantKind), false);
|
|
151
155
|
function isAnchorNode(position, astNode) {
|
|
152
156
|
if (!__1.PositionUtils.isInAst(position, astNode, true, true)) {
|
|
153
157
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activeNodeUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/activeNode/activeNodeUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"activeNodeUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/activeNode/activeNodeUtils.ts"],"names":[],"mappings":"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"}
|
package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as PQP from "@microsoft/powerquery-parser";
|
|
2
|
-
import { InspectionSettings } from "../../inspectionSettings";
|
|
3
2
|
import { TMaybeActiveNode } from "../activeNode";
|
|
4
|
-
import { TypeCache } from "../typeCache";
|
|
5
3
|
import { TriedAutocompleteFieldAccess } from "./commonTypes";
|
|
4
|
+
import { InspectionSettings } from "../../inspectionSettings";
|
|
5
|
+
import { TypeCache } from "../typeCache";
|
|
6
6
|
export declare function tryAutocompleteFieldAccess(settings: InspectionSettings, parseState: PQP.Parser.ParseState, maybeActiveNode: TMaybeActiveNode, typeCache: TypeCache): TriedAutocompleteFieldAccess;
|
|
@@ -28,27 +28,38 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
28
28
|
}
|
|
29
29
|
return ar;
|
|
30
30
|
};
|
|
31
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
32
|
-
for (var i = 0,
|
|
33
|
-
|
|
34
|
-
|
|
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));
|
|
35
39
|
};
|
|
36
40
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
41
|
exports.tryAutocompleteFieldAccess = void 0;
|
|
38
42
|
var PQP = require("@microsoft/powerquery-parser");
|
|
39
|
-
var powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
40
43
|
var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
41
|
-
var
|
|
44
|
+
var powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
42
45
|
var activeNode_1 = require("../activeNode");
|
|
43
|
-
var type_1 = require("../type");
|
|
44
46
|
var autocompleteItem_1 = require("./autocompleteItem");
|
|
47
|
+
var __1 = require("../..");
|
|
48
|
+
var type_1 = require("../type");
|
|
45
49
|
function tryAutocompleteFieldAccess(settings, parseState, maybeActiveNode, typeCache) {
|
|
50
|
+
var _a;
|
|
51
|
+
var trace = settings.traceManager.entry("FieldAccess" /* FieldAccess */, tryAutocompleteFieldAccess.name);
|
|
52
|
+
var result;
|
|
46
53
|
if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
|
|
47
|
-
|
|
54
|
+
result = powerquery_parser_1.ResultUtils.boxOk(undefined);
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
result = powerquery_parser_1.ResultUtils.ensureResult(settings.locale, function () {
|
|
58
|
+
return autocompleteFieldAccess(settings, parseState, maybeActiveNode, typeCache);
|
|
59
|
+
});
|
|
48
60
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
});
|
|
61
|
+
trace.exit((_a = {}, _a["IsError" /* IsError */] = powerquery_parser_1.ResultUtils.isError(result), _a));
|
|
62
|
+
return result;
|
|
52
63
|
}
|
|
53
64
|
exports.tryAutocompleteFieldAccess = tryAutocompleteFieldAccess;
|
|
54
65
|
var AllowedExtendedTypeKindsForFieldEntries = [
|
|
@@ -102,7 +113,7 @@ function autocompleteFieldAccess(settings, parseState, activeNode, typeCache) {
|
|
|
102
113
|
return undefined;
|
|
103
114
|
}
|
|
104
115
|
var field = maybeField;
|
|
105
|
-
var triedFieldType = type_1.tryType(settings, nodeIdMapCollection, field.node.id, typeCache);
|
|
116
|
+
var triedFieldType = (0, type_1.tryType)(settings, nodeIdMapCollection, field.node.id, typeCache);
|
|
106
117
|
if (powerquery_parser_1.ResultUtils.isError(triedFieldType)) {
|
|
107
118
|
throw triedFieldType.error;
|
|
108
119
|
}
|
|
@@ -144,7 +155,7 @@ function fieldEntriesFromFieldType(type) {
|
|
|
144
155
|
}
|
|
145
156
|
case "DefinedRecord" /* DefinedRecord */:
|
|
146
157
|
case "DefinedTable" /* DefinedTable */:
|
|
147
|
-
return __spreadArray([], __read(type.fields.entries()));
|
|
158
|
+
return __spreadArray([], __read(type.fields.entries()), false);
|
|
148
159
|
default:
|
|
149
160
|
return [];
|
|
150
161
|
}
|
|
@@ -172,7 +183,7 @@ function inspectFieldProjection(lexerSnapshot, nodeIdMapCollection, position, fi
|
|
|
172
183
|
isAutocompleteAllowed = true;
|
|
173
184
|
maybeIdentifierUnderPosition = inspectedFieldSelector.maybeIdentifierUnderPosition;
|
|
174
185
|
}
|
|
175
|
-
fieldNames.push.apply(fieldNames, __spreadArray([], __read(inspectedFieldSelector.fieldNames)));
|
|
186
|
+
fieldNames.push.apply(fieldNames, __spreadArray([], __read(inspectedFieldSelector.fieldNames), false));
|
|
176
187
|
}
|
|
177
188
|
}
|
|
178
189
|
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
@@ -282,7 +293,7 @@ function maybeTypablePrimaryExpression(nodeIdMapCollection, activeNode) {
|
|
|
282
293
|
return parser_1.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(nodeIdMapCollection, rpeChild.node.id);
|
|
283
294
|
}
|
|
284
295
|
else {
|
|
285
|
-
throw new PQP.CommonError.InvariantError("the child of a "
|
|
296
|
+
throw new PQP.CommonError.InvariantError("the child of a ".concat("RecursivePrimaryExpression" /* RecursivePrimaryExpression */, " should have an attribute index of either 1 or 2"), {
|
|
286
297
|
parentId: xorNode.node.id,
|
|
287
298
|
childId: xorNodeBeforeRpe.node.id,
|
|
288
299
|
});
|
package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompleteFieldAccess.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"autocompleteFieldAccess.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
1
|
import { CompletionItem } from "vscode-languageserver-types";
|
|
2
|
+
import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
3
3
|
export interface AutocompleteItem extends CompletionItem {
|
|
4
4
|
readonly jaroWinklerScore: number;
|
|
5
5
|
readonly powerQueryType: Type.TPowerQueryType;
|