@microsoft/powerquery-language-services 0.9.2 → 0.9.6
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.js +51 -48
- package/lib/powerquery-language-services/analysis/analysisBase.js.map +1 -1
- package/lib/powerquery-language-services/documentSymbols.js +6 -5
- package/lib/powerquery-language-services/documentSymbols.js.map +1 -1
- package/lib/powerquery-language-services/externalType/externalType.d.ts +1 -1
- package/lib/powerquery-language-services/externalType/externalType.js.map +1 -1
- package/lib/powerquery-language-services/externalType/externalTypeUtils.js +3 -2
- package/lib/powerquery-language-services/externalType/externalTypeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js +41 -40
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.d.ts +4 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js +118 -95
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.d.ts +1 -3
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js +8 -31
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js +31 -31
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js +23 -22
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js +6 -6
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js +6 -6
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js +6 -5
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js +6 -5
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js +122 -78
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js +56 -54
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/commonTypes.d.ts +6 -4
- package/lib/powerquery-language-services/inspection/autocomplete/task.js +6 -9
- package/lib/powerquery-language-services/inspection/autocomplete/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/trailingToken.d.ts +0 -1
- package/lib/powerquery-language-services/inspection/autocomplete/trailingTokenUtils.js +3 -3
- package/lib/powerquery-language-services/inspection/autocomplete/trailingTokenUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/deferenceIdentifier.js +17 -14
- package/lib/powerquery-language-services/inspection/deferenceIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/expectedType.js +61 -60
- package/lib/powerquery-language-services/inspection/expectedType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js +15 -10
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js +8 -6
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js +6 -6
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scope.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/scope/scope.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js +35 -33
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js +20 -18
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/task.js +17 -14
- package/lib/powerquery-language-services/inspection/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js +80 -79
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js +4 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js +20 -20
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js +8 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js +23 -22
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js +4 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js +15 -13
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js +13 -11
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js +4 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js +4 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js +10 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js +10 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js +8 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js +9 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js +9 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js +10 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js +8 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js +9 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js +10 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js +74 -73
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js +11 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js +12 -11
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/task.js +6 -4
- package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
- package/lib/powerquery-language-services/inspectionSettings.d.ts +1 -1
- package/lib/powerquery-language-services/inspectionSettings.js.map +1 -1
- package/lib/powerquery-language-services/inspectionUtils.js +22 -21
- 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/library.js.map +1 -1
- package/lib/powerquery-language-services/library/librarySymbolUtils.js +9 -9
- package/lib/powerquery-language-services/library/librarySymbolUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/libraryUtils.js +12 -11
- package/lib/powerquery-language-services/library/libraryUtils.js.map +1 -1
- package/lib/powerquery-language-services/localization/templates.js +42 -42
- package/lib/powerquery-language-services/localization/templates.js.map +1 -1
- package/lib/powerquery-language-services/positionUtils.d.ts +1 -0
- package/lib/powerquery-language-services/positionUtils.js +20 -15
- package/lib/powerquery-language-services/positionUtils.js.map +1 -1
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js +15 -15
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/libraryProvider.js +7 -6
- package/lib/powerquery-language-services/providers/libraryProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js +15 -13
- package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js +21 -20
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/partialSemanticToken.js +63 -61
- package/lib/powerquery-language-services/providers/localDocumentProvider/partialSemanticToken.js.map +1 -1
- package/lib/powerquery-language-services/tokenPositionComparison.d.ts +1 -1
- package/lib/powerquery-language-services/tokenPositionComparison.js.map +1 -1
- package/lib/powerquery-language-services/trace.d.ts +4 -4
- package/lib/powerquery-language-services/trace.js.map +1 -1
- package/lib/powerquery-language-services/validate/validate.js +2 -1
- package/lib/powerquery-language-services/validate/validate.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js +13 -11
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js +5 -3
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js +5 -3
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js +9 -6
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js.map +1 -1
- package/package.json +4 -4
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;;;;;;;;;;;;AAElC,oDAAoD;AACpD,sFAQmE;AACnE,oEAAmE;
|
|
1
|
+
{"version":3,"file":"autocompleteFieldAccess.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Keyword, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
2
|
import type { AutocompleteItem } from "./autocompleteItem";
|
|
3
3
|
import { Inspection } from "../../..";
|
|
4
4
|
import { Library } from "../../../library";
|
|
5
|
-
export declare function fromFieldAccess(label: string, powerQueryType: Type.TPowerQueryType, other?: string): AutocompleteItem;
|
|
6
5
|
export declare function fromKeywordKind(label: Keyword.KeywordKind, other?: string): AutocompleteItem;
|
|
7
|
-
export declare function fromLanguageConstant(label: Constant.LanguageConstant, other?: string): AutocompleteItem;
|
|
8
6
|
export declare function fromLibraryDefinition(label: string, libraryDefinition: Library.TLibraryDefinition, other?: string): Inspection.AutocompleteItem;
|
|
9
7
|
export declare function fromScopeItem(label: string, scopeItem: Inspection.TScopeItem, powerQueryType: Type.TPowerQueryType, other?: string): AutocompleteItem | undefined;
|
|
10
8
|
export declare function comparer(left: AutocompleteItem, right: AutocompleteItem): number;
|
|
@@ -2,26 +2,13 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.comparer = exports.fromScopeItem = exports.fromLibraryDefinition = exports.
|
|
6
|
-
const PQP = require("@microsoft/powerquery-parser");
|
|
5
|
+
exports.comparer = exports.fromScopeItem = exports.fromLibraryDefinition = exports.fromKeywordKind = void 0;
|
|
7
6
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
8
7
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
9
8
|
const vscode_languageserver_types_1 = require("vscode-languageserver-types");
|
|
10
9
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
11
10
|
const jaroWinkler_1 = require("../../../jaroWinkler");
|
|
12
|
-
|
|
13
|
-
const jaroWinklerScore = other !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, other) : 1;
|
|
14
|
-
// If the key is a quoted identifier but doesn't need to be one then slice out the quote contents.
|
|
15
|
-
const identifierKind = PQP.Language.TextUtils.identifierKind(label, false);
|
|
16
|
-
const normalizedLabel = identifierKind === "Quote" /* Quote */ ? label.slice(2, -1) : label;
|
|
17
|
-
return {
|
|
18
|
-
jaroWinklerScore,
|
|
19
|
-
kind: vscode_languageserver_types_1.CompletionItemKind.Field,
|
|
20
|
-
label: normalizedLabel,
|
|
21
|
-
powerQueryType,
|
|
22
|
-
};
|
|
23
|
-
}
|
|
24
|
-
exports.fromFieldAccess = fromFieldAccess;
|
|
11
|
+
const __1 = require("../../..");
|
|
25
12
|
function fromKeywordKind(label, other) {
|
|
26
13
|
const jaroWinklerScore = other !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, other) : 1;
|
|
27
14
|
return {
|
|
@@ -32,16 +19,6 @@ function fromKeywordKind(label, other) {
|
|
|
32
19
|
};
|
|
33
20
|
}
|
|
34
21
|
exports.fromKeywordKind = fromKeywordKind;
|
|
35
|
-
function fromLanguageConstant(label, other) {
|
|
36
|
-
const jaroWinklerScore = other !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, other) : 1;
|
|
37
|
-
return {
|
|
38
|
-
jaroWinklerScore,
|
|
39
|
-
kind: vscode_languageserver_types_1.CompletionItemKind.Keyword,
|
|
40
|
-
label,
|
|
41
|
-
powerQueryType: language_1.Type.NotApplicableInstance,
|
|
42
|
-
};
|
|
43
|
-
}
|
|
44
|
-
exports.fromLanguageConstant = fromLanguageConstant;
|
|
45
22
|
function fromLibraryDefinition(label, libraryDefinition, other) {
|
|
46
23
|
const jaroWinklerScore = other !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, other) : 1;
|
|
47
24
|
return {
|
|
@@ -54,19 +31,19 @@ function fromLibraryDefinition(label, libraryDefinition, other) {
|
|
|
54
31
|
exports.fromLibraryDefinition = fromLibraryDefinition;
|
|
55
32
|
function fromScopeItem(label, scopeItem, powerQueryType, other) {
|
|
56
33
|
switch (scopeItem.kind) {
|
|
57
|
-
case
|
|
58
|
-
case
|
|
59
|
-
case
|
|
34
|
+
case __1.Inspection.ScopeItemKind.LetVariable:
|
|
35
|
+
case __1.Inspection.ScopeItemKind.RecordField:
|
|
36
|
+
case __1.Inspection.ScopeItemKind.SectionMember:
|
|
60
37
|
if (scopeItem.value === undefined) {
|
|
61
38
|
return undefined;
|
|
62
39
|
}
|
|
63
40
|
break;
|
|
64
|
-
case
|
|
41
|
+
case __1.Inspection.ScopeItemKind.Each:
|
|
65
42
|
return undefined;
|
|
66
|
-
case
|
|
43
|
+
case __1.Inspection.ScopeItemKind.Parameter: {
|
|
67
44
|
break;
|
|
68
45
|
}
|
|
69
|
-
case
|
|
46
|
+
case __1.Inspection.ScopeItemKind.Undefined: {
|
|
70
47
|
if (parser_1.XorNodeUtils.isContext(scopeItem.xorNode)) {
|
|
71
48
|
return undefined;
|
|
72
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompleteItemUtils.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,
|
|
1
|
+
{"version":3,"file":"autocompleteItemUtils.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAA4F;AAC5F,oEAAsD;AACtD,6EAAiE;AACjE,sFAAyF;AAGzF,sDAA4D;AAC5D,gCAAsC;AAGtC,SAAgB,eAAe,CAAC,KAA0B,EAAE,KAAc;IACtE,MAAM,gBAAgB,GAAW,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,kCAAoB,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9F,OAAO;QACH,gBAAgB;QAChB,IAAI,EAAE,gDAAkB,CAAC,OAAO;QAChC,KAAK;QACL,cAAc,EAAE,eAAI,CAAC,qBAAqB;KAC7C,CAAC;AACN,CAAC;AATD,0CASC;AAED,SAAgB,qBAAqB,CACjC,KAAa,EACb,iBAA6C,EAC7C,KAAc;IAEd,MAAM,gBAAgB,GAAW,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,kCAAoB,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9F,OAAO;QACH,gBAAgB;QAChB,IAAI,EAAE,iBAAiB,CAAC,kBAAkB;QAC1C,KAAK;QACL,cAAc,EAAE,iBAAiB,CAAC,gBAAgB;KACrD,CAAC;AACN,CAAC;AAbD,sDAaC;AAED,SAAgB,aAAa,CACzB,KAAa,EACb,SAAgC,EAChC,cAAoC,EACpC,KAAc;IAEd,QAAQ,SAAS,CAAC,IAAI,EAAE;QACpB,KAAK,cAAU,CAAC,aAAa,CAAC,WAAW,CAAC;QAC1C,KAAK,cAAU,CAAC,aAAa,CAAC,WAAW,CAAC;QAC1C,KAAK,cAAU,CAAC,aAAa,CAAC,aAAa;YACvC,IAAI,SAAS,CAAC,KAAK,KAAK,SAAS,EAAE;gBAC/B,OAAO,SAAS,CAAC;aACpB;YAED,MAAM;QAEV,KAAK,cAAU,CAAC,aAAa,CAAC,IAAI;YAC9B,OAAO,SAAS,CAAC;QAErB,KAAK,cAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YACrC,MAAM;SACT;QAED,KAAK,cAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YACrC,IAAI,qBAAY,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;gBAC3C,OAAO,SAAS,CAAC;aACpB;YAED,MAAM;SACT;QAED;YACI,MAAM,0BAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;KACvC;IAED,MAAM,gBAAgB,GAAW,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,kCAAoB,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9F,OAAO;QACH,gBAAgB;QAChB,IAAI,EAAE,gDAAkB,CAAC,QAAQ;QACjC,KAAK;QACL,cAAc;KACjB,CAAC;AACN,CAAC;AA3CD,sCA2CC;AAED,SAAgB,QAAQ,CAAC,IAAsB,EAAE,KAAuB;IACpE,MAAM,oBAAoB,GAAW,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;IAEpF,IAAI,oBAAoB,KAAK,CAAC,EAAE;QAC5B,OAAO,oBAAoB,CAAC;KAC/B;SAAM,IAAI,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE;QACjC,OAAO,CAAC,CAAC,CAAC;KACb;SAAM,IAAI,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE;QACjC,OAAO,CAAC,CAAC;KACZ;SAAM;QACH,OAAO,CAAC,CAAC;KACZ;AACL,CAAC;AAZD,4BAYC"}
|
|
@@ -30,7 +30,7 @@ function tryAutocompleteKeyword(settings, nodeIdMapCollection, activeNode, trail
|
|
|
30
30
|
if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(activeNode)) {
|
|
31
31
|
return Promise.resolve(powerquery_parser_1.ResultUtils.ok([
|
|
32
32
|
...language_1.Keyword.ExpressionKeywordKinds.map((keywordKind) => autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(keywordKind)),
|
|
33
|
-
autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(
|
|
33
|
+
autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(language_1.Keyword.KeywordKind.Section),
|
|
34
34
|
]));
|
|
35
35
|
}
|
|
36
36
|
return powerquery_parser_1.ResultUtils.ensureResultAsync(() => autocompleteKeyword(nodeIdMapCollection, activeNode, trailingToken), settings.locale);
|
|
@@ -45,9 +45,9 @@ function autocompleteKeyword(nodeIdMapCollection, activeNode, trailingToken) {
|
|
|
45
45
|
positionName = activeNode.exclusiveIdentifierUnderPosition.normalizedLiteral;
|
|
46
46
|
}
|
|
47
47
|
// Matches 'null', 'true', and 'false'.
|
|
48
|
-
else if (parser_1.XorNodeUtils.isAstChecked(ancestryLeaf,
|
|
49
|
-
(ancestryLeaf.node.literalKind ===
|
|
50
|
-
ancestryLeaf.node.literalKind ===
|
|
48
|
+
else if (parser_1.XorNodeUtils.isAstChecked(ancestryLeaf, language_1.Ast.NodeKind.LiteralExpression) &&
|
|
49
|
+
(ancestryLeaf.node.literalKind === language_1.Ast.LiteralKind.Logical ||
|
|
50
|
+
ancestryLeaf.node.literalKind === language_1.Ast.LiteralKind.Null)) {
|
|
51
51
|
positionName = ancestryLeaf.node.literal;
|
|
52
52
|
}
|
|
53
53
|
}
|
|
@@ -73,11 +73,11 @@ function autocompleteKeyword(nodeIdMapCollection, activeNode, trailingToken) {
|
|
|
73
73
|
}
|
|
74
74
|
exports.autocompleteKeyword = autocompleteKeyword;
|
|
75
75
|
const ConjunctionKeywords = [
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
76
|
+
language_1.Keyword.KeywordKind.And,
|
|
77
|
+
language_1.Keyword.KeywordKind.As,
|
|
78
|
+
language_1.Keyword.KeywordKind.Is,
|
|
79
|
+
language_1.Keyword.KeywordKind.Meta,
|
|
80
|
+
language_1.Keyword.KeywordKind.Or,
|
|
81
81
|
];
|
|
82
82
|
// Travel the ancestry path in Active node in [parent, child] pairs.
|
|
83
83
|
// Without zipping the values we wouldn't know what we're completing for.
|
|
@@ -93,20 +93,20 @@ function traverseAncestors(state) {
|
|
|
93
93
|
state.parent = ancestry[ancestryIndex];
|
|
94
94
|
state.child = ancestry[ancestryIndex - 1];
|
|
95
95
|
switch (state.parent.node.kind) {
|
|
96
|
-
case
|
|
96
|
+
case language_1.Ast.NodeKind.ErrorHandlingExpression:
|
|
97
97
|
inspected = (0, autocompleteKeywordErrorHandlingExpression_1.autocompleteKeywordErrorHandlingExpression)(state);
|
|
98
98
|
break;
|
|
99
|
-
case
|
|
99
|
+
case language_1.Ast.NodeKind.IdentifierPairedExpression:
|
|
100
100
|
inspected = (0, autocompleteKeywordIdentifierPairedExpression_1.autocompleteKeywordIdentifierPairedExpression)(state);
|
|
101
101
|
break;
|
|
102
|
-
case
|
|
102
|
+
case language_1.Ast.NodeKind.LetExpression:
|
|
103
103
|
// eslint-disable-next-line no-await-in-loop
|
|
104
104
|
inspected = yield (0, autocompleteKeywordLetExpression_1.autocompleteKeywordLetExpression)(state);
|
|
105
105
|
break;
|
|
106
|
-
case
|
|
106
|
+
case language_1.Ast.NodeKind.ListExpression:
|
|
107
107
|
inspected = (0, autocompleteKeywordListExpression_1.autocompleteKeywordListExpression)(state);
|
|
108
108
|
break;
|
|
109
|
-
case
|
|
109
|
+
case language_1.Ast.NodeKind.SectionMember:
|
|
110
110
|
// eslint-disable-next-line no-await-in-loop
|
|
111
111
|
inspected = yield (0, autocompleteKeywordSectionMember_1.autocompleteKeywordSectionMember)(state);
|
|
112
112
|
break;
|
|
@@ -127,23 +127,23 @@ function findEdgeCase(activeNode, trailingToken) {
|
|
|
127
127
|
// `l|` -> `let`
|
|
128
128
|
if (trailingToken === undefined &&
|
|
129
129
|
ancestry.length === 2 &&
|
|
130
|
-
parser_1.XorNodeUtils.isAstChecked(ancestry[0],
|
|
131
|
-
parser_1.XorNodeUtils.isNodeKind(ancestry[1],
|
|
130
|
+
parser_1.XorNodeUtils.isAstChecked(ancestry[0], language_1.Ast.NodeKind.Identifier) &&
|
|
131
|
+
parser_1.XorNodeUtils.isNodeKind(ancestry[1], language_1.Ast.NodeKind.IdentifierExpression)) {
|
|
132
132
|
const identifier = ancestry[0].node.literal;
|
|
133
133
|
inspected = language_1.Keyword.StartOfDocumentKeywords.map((keywordKind) => autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(keywordKind, identifier));
|
|
134
134
|
}
|
|
135
135
|
// `(x |) => x+1` -> `(x as|) => x+1`
|
|
136
|
-
else if (parser_1.XorNodeUtils.isAstChecked(ancestry[0],
|
|
137
|
-
parser_1.XorNodeUtils.isNodeKind(ancestry[1],
|
|
138
|
-
activeNode.leafKind ===
|
|
139
|
-
inspected = [autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(
|
|
136
|
+
else if (parser_1.XorNodeUtils.isAstChecked(ancestry[0], language_1.Ast.NodeKind.Identifier) &&
|
|
137
|
+
parser_1.XorNodeUtils.isNodeKind(ancestry[1], language_1.Ast.NodeKind.Parameter) &&
|
|
138
|
+
activeNode.leafKind === activeNode_1.ActiveNodeLeafKind.IsBeforePosition) {
|
|
139
|
+
inspected = [autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(language_1.Keyword.KeywordKind.As)];
|
|
140
140
|
}
|
|
141
141
|
// `(foo a|) => foo` -> `(foo as) => foo
|
|
142
142
|
else if ((trailingToken === null || trailingToken === void 0 ? void 0 : trailingToken.data) === "a" &&
|
|
143
|
-
parser_1.XorNodeUtils.isContextChecked(ancestry[0],
|
|
144
|
-
parser_1.XorNodeUtils.isNodeKind(ancestry[1],
|
|
145
|
-
parser_1.XorNodeUtils.isNodeKind(ancestry[2],
|
|
146
|
-
inspected = [autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(
|
|
143
|
+
parser_1.XorNodeUtils.isContextChecked(ancestry[0], language_1.Ast.NodeKind.Constant) &&
|
|
144
|
+
parser_1.XorNodeUtils.isNodeKind(ancestry[1], language_1.Ast.NodeKind.ParameterList) &&
|
|
145
|
+
parser_1.XorNodeUtils.isNodeKind(ancestry[2], language_1.Ast.NodeKind.FunctionExpression)) {
|
|
146
|
+
inspected = [autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(language_1.Keyword.KeywordKind.As)];
|
|
147
147
|
}
|
|
148
148
|
return inspected;
|
|
149
149
|
}
|
|
@@ -151,26 +151,26 @@ function createAutocompleteItems(keywordKinds, positionName) {
|
|
|
151
151
|
return keywordKinds.map((kind) => autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(kind, positionName));
|
|
152
152
|
}
|
|
153
153
|
function handleConjunctions(activeNode, inspected, trailingToken) {
|
|
154
|
-
if (activeNode.leafKind !==
|
|
155
|
-
activeNode.leafKind !==
|
|
154
|
+
if (activeNode.leafKind !== activeNode_1.ActiveNodeLeafKind.IsBeforePosition &&
|
|
155
|
+
activeNode.leafKind !== activeNode_1.ActiveNodeLeafKind.ContextNode) {
|
|
156
156
|
return inspected;
|
|
157
157
|
}
|
|
158
158
|
// Might be a section document.
|
|
159
159
|
// `[x=1] s`
|
|
160
160
|
// `[x=1] |`
|
|
161
161
|
if (activeNode.ancestry.length === 2 &&
|
|
162
|
-
parser_1.XorNodeUtils.isAstChecked(activeNode.ancestry[1],
|
|
162
|
+
parser_1.XorNodeUtils.isAstChecked(activeNode.ancestry[1], language_1.Ast.NodeKind.RecordExpression)) {
|
|
163
163
|
if (trailingToken === undefined) {
|
|
164
|
-
return PQP.ArrayUtils.concatUnique(inspected, [
|
|
164
|
+
return PQP.ArrayUtils.concatUnique(inspected, [language_1.Keyword.KeywordKind.Section]);
|
|
165
165
|
}
|
|
166
|
-
else if (trailingToken.kind ===
|
|
166
|
+
else if (trailingToken.kind === PQP.Language.Token.TokenKind.Identifier &&
|
|
167
167
|
__1.PositionUtils.isInToken(activeNode.position, trailingToken, true, true)) {
|
|
168
|
-
return (0, autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText)(inspected, trailingToken, [
|
|
168
|
+
return (0, autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText)(inspected, trailingToken, [language_1.Keyword.KeywordKind.Section]);
|
|
169
169
|
}
|
|
170
170
|
}
|
|
171
171
|
const activeNodeLeaf = activeNode_1.ActiveNodeUtils.assertGetLeaf(activeNode);
|
|
172
172
|
// `let x = 1 a|`
|
|
173
|
-
if (trailingToken !== undefined && trailingToken.
|
|
173
|
+
if (trailingToken !== undefined && trailingToken.isPositionEitherInOrOnToken) {
|
|
174
174
|
return (0, autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText)(inspected, trailingToken, undefined);
|
|
175
175
|
}
|
|
176
176
|
// `let x = |`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompleteKeyword.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAA2F;AAC3F,sFAA8G;AAC9G,oEAA2D;AAE3D,iDAAgG;AAChG,0DAA8E;AAC9E,6EAA0E;AAC1E,6GAA0G;AAC1G,mHAAgH;AAChH,yFAAsF;AACtF,2FAAwF;AACxF,yFAAsF;AACtF,uFAAoF;AAEpF,gCAAyC;AAIzC,SAAgB,sBAAsB,CAClC,QAA4B,EAC5B,mBAAyC,EACzC,UAAuB,EACvB,aAAwC;IAExC,IAAI,CAAC,4BAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE;QACjD,OAAO,OAAO,CAAC,OAAO,CAClB,+BAAW,CAAC,EAAE,CAAC;YACX,GAAG,kBAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,WAAgC,EAAE,EAAE,CACvE,wCAAqB,CAAC,eAAe,CAAC,WAAW,CAAC,CACrD;YACD,wCAAqB,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"autocompleteKeyword.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.autocompleteKeywordDefault = void 0;
|
|
6
6
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
7
7
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
8
|
+
const activeNode_1 = require("../../activeNode");
|
|
8
9
|
const __1 = require("../../..");
|
|
9
10
|
function autocompleteKeywordDefault(state) {
|
|
10
11
|
const activeNode = state.activeNode;
|
|
@@ -22,46 +23,46 @@ function autocompleteKeywordDefault(state) {
|
|
|
22
23
|
}
|
|
23
24
|
exports.autocompleteKeywordDefault = autocompleteKeywordDefault;
|
|
24
25
|
const AutocompleteExpressionKeys = [
|
|
25
|
-
createMapKey(
|
|
26
|
-
createMapKey(
|
|
27
|
-
createMapKey(
|
|
28
|
-
createMapKey(
|
|
29
|
-
createMapKey(
|
|
30
|
-
createMapKey(
|
|
31
|
-
createMapKey(
|
|
32
|
-
createMapKey(
|
|
33
|
-
createMapKey(
|
|
34
|
-
createMapKey(
|
|
35
|
-
createMapKey(
|
|
36
|
-
createMapKey(
|
|
26
|
+
createMapKey(language_1.Ast.NodeKind.ErrorRaisingExpression, 1),
|
|
27
|
+
createMapKey(language_1.Ast.NodeKind.GeneralizedIdentifierPairedExpression, 2),
|
|
28
|
+
createMapKey(language_1.Ast.NodeKind.FunctionExpression, 3),
|
|
29
|
+
createMapKey(language_1.Ast.NodeKind.IdentifierPairedExpression, 2),
|
|
30
|
+
createMapKey(language_1.Ast.NodeKind.IfExpression, 1),
|
|
31
|
+
createMapKey(language_1.Ast.NodeKind.IfExpression, 3),
|
|
32
|
+
createMapKey(language_1.Ast.NodeKind.IfExpression, 5),
|
|
33
|
+
createMapKey(language_1.Ast.NodeKind.InvokeExpression, 1),
|
|
34
|
+
createMapKey(language_1.Ast.NodeKind.LetExpression, 3),
|
|
35
|
+
createMapKey(language_1.Ast.NodeKind.ListExpression, 1),
|
|
36
|
+
createMapKey(language_1.Ast.NodeKind.OtherwiseExpression, 1),
|
|
37
|
+
createMapKey(language_1.Ast.NodeKind.ParenthesizedExpression, 1),
|
|
37
38
|
];
|
|
38
39
|
// If we're coming from a constant then we can quickly evaluate using a map.
|
|
39
40
|
// This is possible because reading a Constant is binary.
|
|
40
41
|
// Either the Constant was read and you're in the next context, or you didn't and you're in the constant's context.
|
|
41
42
|
const AutocompleteConstantMap = new Map([
|
|
42
43
|
// Ast.NodeKind.ErrorRaisingExpression
|
|
43
|
-
[createMapKey(
|
|
44
|
+
[createMapKey(language_1.Ast.NodeKind.ErrorRaisingExpression, 0), language_1.Keyword.KeywordKind.Error],
|
|
44
45
|
// Ast.NodeKind.IfExpression
|
|
45
|
-
[createMapKey(
|
|
46
|
-
[createMapKey(
|
|
47
|
-
[createMapKey(
|
|
46
|
+
[createMapKey(language_1.Ast.NodeKind.IfExpression, 0), language_1.Keyword.KeywordKind.If],
|
|
47
|
+
[createMapKey(language_1.Ast.NodeKind.IfExpression, 2), language_1.Keyword.KeywordKind.Then],
|
|
48
|
+
[createMapKey(language_1.Ast.NodeKind.IfExpression, 4), language_1.Keyword.KeywordKind.Else],
|
|
48
49
|
// Ast.NodeKind.LetExpression
|
|
49
|
-
[createMapKey(
|
|
50
|
+
[createMapKey(language_1.Ast.NodeKind.LetExpression, 2), language_1.Keyword.KeywordKind.In],
|
|
50
51
|
// Ast.NodeKind.OtherwiseExpression
|
|
51
|
-
[createMapKey(
|
|
52
|
+
[createMapKey(language_1.Ast.NodeKind.OtherwiseExpression, 0), language_1.Keyword.KeywordKind.Otherwise],
|
|
52
53
|
// Ast.NodeKind.Section
|
|
53
|
-
[createMapKey(
|
|
54
|
+
[createMapKey(language_1.Ast.NodeKind.Section, 1), language_1.Keyword.KeywordKind.Section],
|
|
54
55
|
]);
|
|
55
56
|
function autocompleteDefaultExpression(state) {
|
|
56
57
|
const activeNode = state.activeNode;
|
|
57
58
|
const child = state.child;
|
|
58
59
|
// '[x=|1]
|
|
59
|
-
if (activeNode.leafKind ===
|
|
60
|
+
if (activeNode.leafKind === activeNode_1.ActiveNodeLeafKind.IsInAst) {
|
|
60
61
|
return language_1.Keyword.ExpressionKeywordKinds;
|
|
61
62
|
}
|
|
62
63
|
// `if 1|`
|
|
63
|
-
else if (parser_1.XorNodeUtils.isAstChecked(child,
|
|
64
|
-
child.node.literalKind ===
|
|
64
|
+
else if (parser_1.XorNodeUtils.isAstChecked(child, language_1.Ast.NodeKind.LiteralExpression) &&
|
|
65
|
+
child.node.literalKind === language_1.Ast.LiteralKind.Numeric) {
|
|
65
66
|
return [];
|
|
66
67
|
}
|
|
67
68
|
return language_1.Keyword.ExpressionKeywordKinds;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompleteKeywordDefault.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAA2F;AAC3F,sFAAmG;
|
|
1
|
+
{"version":3,"file":"autocompleteKeywordDefault.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ function autocompleteKeywordErrorHandlingExpression(state) {
|
|
|
12
12
|
const trailingText = state.trailingToken;
|
|
13
13
|
const childAttributeIndex = child.node.attributeIndex;
|
|
14
14
|
if (childAttributeIndex === 0) {
|
|
15
|
-
return [
|
|
15
|
+
return [language_1.Keyword.KeywordKind.Try];
|
|
16
16
|
}
|
|
17
17
|
else if (childAttributeIndex === 1) {
|
|
18
18
|
// 'try true o|' creates a ParseError.
|
|
@@ -20,19 +20,19 @@ function autocompleteKeywordErrorHandlingExpression(state) {
|
|
|
20
20
|
if (trailingText !== undefined) {
|
|
21
21
|
const trailingToken = trailingText;
|
|
22
22
|
// First we test if we can autocomplete using the error token.
|
|
23
|
-
if (trailingToken.kind ===
|
|
23
|
+
if (trailingToken.kind === language_1.Token.TokenKind.Identifier &&
|
|
24
24
|
__1.PositionUtils.isInToken(position, trailingToken, false, true)) {
|
|
25
25
|
const tokenData = trailingText.data;
|
|
26
26
|
// If we can exclude 'or' then the only thing we can autocomplete is 'otherwise'.
|
|
27
|
-
if (tokenData.length > 1 &&
|
|
28
|
-
return [
|
|
27
|
+
if (tokenData.length > 1 && language_1.Keyword.KeywordKind.Otherwise.startsWith(tokenData)) {
|
|
28
|
+
return [language_1.Keyword.KeywordKind.Otherwise];
|
|
29
29
|
}
|
|
30
30
|
// In the ambiguous case we don't know what they're typing yet, so we suggest both.
|
|
31
31
|
// In the case of an identifier that doesn't match a 'or' or 'otherwise'
|
|
32
32
|
// we still suggest the only valid keywords allowed.
|
|
33
33
|
// In both cases the return is the same.
|
|
34
34
|
else {
|
|
35
|
-
return [
|
|
35
|
+
return [language_1.Keyword.KeywordKind.Or, language_1.Keyword.KeywordKind.Otherwise];
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
// There exists an error token we can't map it to an OtherwiseExpression.
|
|
@@ -41,7 +41,7 @@ function autocompleteKeywordErrorHandlingExpression(state) {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
else if (parser_1.XorNodeUtils.isAst(child) && __1.PositionUtils.isAfterAst(position, child.node, true)) {
|
|
44
|
-
return [
|
|
44
|
+
return [language_1.Keyword.KeywordKind.Otherwise];
|
|
45
45
|
}
|
|
46
46
|
else {
|
|
47
47
|
return language_1.Keyword.ExpressionKeywordKinds;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompleteKeywordErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAA6F;AAC7F,sFAAmG;AAInG,gCAAyC;AAGzC,SAAgB,0CAA0C,CACtD,KAAsC;IAEtC,MAAM,QAAQ,GAAa,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,MAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IACpC,MAAM,YAAY,GAA8B,KAAK,CAAC,aAAa,CAAC;IACpE,MAAM,mBAAmB,GAAuB,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;IAE1E,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAC3B,OAAO,
|
|
1
|
+
{"version":3,"file":"autocompleteKeywordErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAA6F;AAC7F,sFAAmG;AAInG,gCAAyC;AAGzC,SAAgB,0CAA0C,CACtD,KAAsC;IAEtC,MAAM,QAAQ,GAAa,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,MAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IACpC,MAAM,YAAY,GAA8B,KAAK,CAAC,aAAa,CAAC;IACpE,MAAM,mBAAmB,GAAuB,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;IAE1E,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAC3B,OAAO,CAAC,kBAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;KACpC;SAAM,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAClC,sCAAsC;QACtC,mFAAmF;QACnF,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,MAAM,aAAa,GAAkB,YAAY,CAAC;YAElD,8DAA8D;YAC9D,IACI,aAAa,CAAC,IAAI,KAAK,gBAAK,CAAC,SAAS,CAAC,UAAU;gBACjD,iBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,EAC/D;gBACE,MAAM,SAAS,GAAW,YAAY,CAAC,IAAI,CAAC;gBAE5C,iFAAiF;gBACjF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,kBAAO,CAAC,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;oBAC7E,OAAO,CAAC,kBAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;iBAC1C;gBACD,mFAAmF;gBACnF,wEAAwE;gBACxE,oDAAoD;gBACpD,wCAAwC;qBACnC;oBACD,OAAO,CAAC,kBAAO,CAAC,WAAW,CAAC,EAAE,EAAE,kBAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;iBAClE;aACJ;YAED,yEAAyE;iBACpE;gBACD,OAAO,SAAS,CAAC;aACpB;SACJ;aAAM,IAAI,qBAAY,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,iBAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC1F,OAAO,CAAC,kBAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;SAC1C;aAAM;YACH,OAAO,kBAAO,CAAC,sBAAsB,CAAC;SACzC;KACJ;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAhDD,gGAgDC"}
|
|
@@ -11,8 +11,8 @@ function autocompleteKeywordIdentifierPairedExpression(state) {
|
|
|
11
11
|
// `section; s|`
|
|
12
12
|
// `section; [] |`
|
|
13
13
|
if (childAttributeIndex === 0 &&
|
|
14
|
-
parser_1.AncestryUtils.nthChecked(state.activeNode.ancestry, state.ancestryIndex + 1,
|
|
15
|
-
return [
|
|
14
|
+
parser_1.AncestryUtils.nthChecked(state.activeNode.ancestry, state.ancestryIndex + 1, language_1.Ast.NodeKind.SectionMember)) {
|
|
15
|
+
return [language_1.Keyword.KeywordKind.Shared];
|
|
16
16
|
}
|
|
17
17
|
else if (childAttributeIndex !== 2) {
|
|
18
18
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompleteKeywordIdentifierPairedExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,sFAA0G;AAC1G,0FAA2F;AAG3F,gCAAyC;AAEzC,SAAgB,6CAA6C,CACzD,KAAsC;IAEtC,MAAM,mBAAmB,GAAuB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;IAEhF,gBAAgB;IAChB,kBAAkB;IAClB,IACI,mBAAmB,KAAK,CAAC;QACzB,sBAAa,CAAC,UAAU,CACpB,KAAK,CAAC,UAAU,CAAC,QAAQ,EACzB,KAAK,CAAC,aAAa,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"autocompleteKeywordIdentifierPairedExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,sFAA0G;AAC1G,0FAA2F;AAG3F,gCAAyC;AAEzC,SAAgB,6CAA6C,CACzD,KAAsC;IAEtC,MAAM,mBAAmB,GAAuB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;IAEhF,gBAAgB;IAChB,kBAAkB;IAClB,IACI,mBAAmB,KAAK,CAAC;QACzB,sBAAa,CAAC,UAAU,CACpB,KAAK,CAAC,UAAU,CAAC,QAAQ,EACzB,KAAK,CAAC,aAAa,GAAG,CAAC,EACvB,cAAG,CAAC,QAAQ,CAAC,aAAa,CAC7B,EACH;QACE,OAAO,CAAC,kBAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;KACvC;SAAM,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAClC,OAAO,EAAE,CAAC;KACb;IAED,MAAM,IAAI,GAA0B,uBAAc,CAAC,YAAY,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEhH,UAAU;IACV,WAAW;IACX,IAAI,IAAI,KAAK,SAAS,IAAI,iBAAa,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE;QACzF,OAAO,kBAAO,CAAC,sBAAsB,CAAC;KACzC;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AA7BD,sGA6BC"}
|
|
@@ -27,28 +27,28 @@ function autocompleteKeywordLetExpression(state) {
|
|
|
27
27
|
// Might be either `in` or whatever the autocomplete is for the the last child of the variableList.
|
|
28
28
|
// `let x = 1 |`
|
|
29
29
|
if (child.node.attributeIndex === 2 && parser_1.XorNodeUtils.isContext(child)) {
|
|
30
|
-
inspected = yield autocompleteLastKeyValuePair(state, parser_1.NodeIdMapIterator.iterLetExpression(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsNodeKind(state.parent,
|
|
30
|
+
inspected = yield autocompleteLastKeyValuePair(state, parser_1.NodeIdMapIterator.iterLetExpression(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsNodeKind(state.parent, language_1.Ast.NodeKind.LetExpression)));
|
|
31
31
|
if (state.trailingToken !== undefined) {
|
|
32
|
-
if (state.trailingToken.
|
|
32
|
+
if (state.trailingToken.isPositionEitherInOrOnToken) {
|
|
33
33
|
// We don't want inspected to be zero legnth.
|
|
34
34
|
// It's either undefined or non-zero length.
|
|
35
35
|
inspected = (0, autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText)(inspected !== null && inspected !== void 0 ? inspected : [], state.trailingToken, [
|
|
36
|
-
|
|
36
|
+
language_1.Keyword.KeywordKind.In,
|
|
37
37
|
]);
|
|
38
38
|
return inspected.length ? inspected : undefined;
|
|
39
39
|
}
|
|
40
40
|
else if (__1.PositionUtils.isBeforeTokenPosition(state.activeNode.position, state.trailingToken.positionStart, true)) {
|
|
41
|
-
return inspected !== undefined ? [...inspected,
|
|
41
|
+
return inspected !== undefined ? [...inspected, language_1.Keyword.KeywordKind.In] : inspected;
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
else {
|
|
45
|
-
return inspected !== undefined ? [...inspected,
|
|
45
|
+
return inspected !== undefined ? [...inspected, language_1.Keyword.KeywordKind.In] : [language_1.Keyword.KeywordKind.In];
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
// `let foo = e|` where we want to treat the identifier as a potential keyword
|
|
49
49
|
else if (child.node.attributeIndex === 1) {
|
|
50
50
|
const identifier = parser_1.AncestryUtils.nth(state.activeNode.ancestry, state.ancestryIndex - 5);
|
|
51
|
-
if (identifier && parser_1.XorNodeUtils.isAstChecked(identifier,
|
|
51
|
+
if (identifier && parser_1.XorNodeUtils.isAstChecked(identifier, language_1.Ast.NodeKind.Identifier)) {
|
|
52
52
|
const identifierAst = identifier.node;
|
|
53
53
|
inspected = language_1.Keyword.ExpressionKeywordKinds.filter((value) => value.startsWith(identifierAst.literal));
|
|
54
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompleteKeywordLetExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAKmE;AACnE,0FAA2F;AAE3F,6EAA0E;AAC1E,qCAA4D;AAC5D,uFAAoF;AAEpF,gCAAyC;AAEzC,SAAsB,gCAAgC,CAClD,KAAsC;;QAEtC,8FAA8F;QAC9F,gEAAgE;QAChE,MAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;QACpC,IAAI,SAAyD,CAAC;QAE9D,mGAAmG;QACnG,gBAAgB;QAChB,IAAI,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,IAAI,qBAAY,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAClE,SAAS,GAAG,MAAM,4BAA4B,CAC1C,KAAK,EACL,0BAAiB,CAAC,iBAAiB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,qBAAY,CAAC,gBAAgB,CAAoB,KAAK,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"autocompleteKeywordLetExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ function autocompleteKeywordListExpression(state) {
|
|
|
26
26
|
}
|
|
27
27
|
// We know it's the node component of the Csv,
|
|
28
28
|
// but we have to drill down one more level if it's a RangeExpression.
|
|
29
|
-
const itemNode = parser_1.XorNodeUtils.isNodeKind(nodeOrComma,
|
|
29
|
+
const itemNode = parser_1.XorNodeUtils.isNodeKind(nodeOrComma, language_1.Ast.NodeKind.RangeExpression)
|
|
30
30
|
? parser_1.AncestryUtils.assertNth(activeNode.ancestry, ancestryIndex - 4)
|
|
31
31
|
: nodeOrComma;
|
|
32
32
|
if (parser_1.XorNodeUtils.isContext(itemNode) || __1.PositionUtils.isBeforeXor(activeNode.position, itemNode, false)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompleteKeywordListExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,sFAAkH;AAClH,0FAA2F;AAC3F,oEAAsD;AAItD,gCAAyC;AAEzC,SAAgB,iCAAiC,CAC7C,KAAsC;IAEtC,MAAM,UAAU,GAAe,KAAK,CAAC,UAAU,CAAC;IAChD,MAAM,aAAa,GAAW,KAAK,CAAC,aAAa,CAAC;IAClD,MAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IAEpC,aAAa;IACb,IAAI,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE;QACpE,OAAO,SAAS,CAAC;KACpB;IAED,0BAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE,yBAAyB,EAAE;QACtE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE;QACrB,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc;KAC5C,CAAC,CAAC;IAEH,6CAA6C;IAC7C,MAAM,WAAW,GAAa,sBAAa,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC;IAE9F,IAAI,WAAW,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE;QACvC,OAAO,SAAS,CAAC;KACpB;IAED,8CAA8C;IAC9C,sEAAsE;IACtE,MAAM,QAAQ,GAAa,qBAAY,CAAC,UAAU,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"autocompleteKeywordListExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,sFAAkH;AAClH,0FAA2F;AAC3F,oEAAsD;AAItD,gCAAyC;AAEzC,SAAgB,iCAAiC,CAC7C,KAAsC;IAEtC,MAAM,UAAU,GAAe,KAAK,CAAC,UAAU,CAAC;IAChD,MAAM,aAAa,GAAW,KAAK,CAAC,aAAa,CAAC;IAClD,MAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IAEpC,aAAa;IACb,IAAI,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE;QACpE,OAAO,SAAS,CAAC;KACpB;IAED,0BAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE,yBAAyB,EAAE;QACtE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE;QACrB,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc;KAC5C,CAAC,CAAC;IAEH,6CAA6C;IAC7C,MAAM,WAAW,GAAa,sBAAa,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC;IAE9F,IAAI,WAAW,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE;QACvC,OAAO,SAAS,CAAC;KACpB;IAED,8CAA8C;IAC9C,sEAAsE;IACtE,MAAM,QAAQ,GAAa,qBAAY,CAAC,UAAU,CAAC,WAAW,EAAE,cAAG,CAAC,QAAQ,CAAC,eAAe,CAAC;QACzF,CAAC,CAAC,sBAAa,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,GAAG,CAAC,CAAC;QACjE,CAAC,CAAC,WAAW,CAAC;IAElB,IAAI,qBAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,iBAAa,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE;QACrG,OAAO,kBAAO,CAAC,sBAAsB,CAAC;KACzC;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAnCD,8EAmCC"}
|