npm - @microsoft/powerquery-language-services - Versions diffs - 0.6.12 → 0.9.6 - Mend

@microsoft/powerquery-language-services 0.6.12 → 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.

Files changed (198) hide show

package/lib/powerquery-language-services/providers/nullSymbolProvider.js CHANGED Viewed

@@ -28,37 +28,37 @@ class NullSymbolProvider {
     // eslint-disable-next-line require-await
     getAutocompleteItems(_context) {
         return __awaiter(this, void 0, void 0, function* () {
-            return powerquery_parser_1.ResultUtils.boxOk(undefined);
+            return powerquery_parser_1.ResultUtils.ok(undefined);
         });
     }
     // eslint-disable-next-line require-await
     getDefinition(_context) {
         return __awaiter(this, void 0, void 0, function* () {
-            return powerquery_parser_1.ResultUtils.boxOk(undefined);
+            return powerquery_parser_1.ResultUtils.ok(undefined);
         });
     }
     // eslint-disable-next-line require-await
     getFoldingRanges(_context) {
         return __awaiter(this, void 0, void 0, function* () {
-            return powerquery_parser_1.ResultUtils.boxOk([]);
+            return powerquery_parser_1.ResultUtils.ok([]);
         });
     }
     // eslint-disable-next-line require-await
     getHover(_context) {
         return __awaiter(this, void 0, void 0, function* () {
-            return powerquery_parser_1.ResultUtils.boxOk(undefined);
+            return powerquery_parser_1.ResultUtils.ok(undefined);
         });
     }
     // eslint-disable-next-line require-await
     getPartialSemanticTokens(_context) {
         return __awaiter(this, void 0, void 0, function* () {
-            return powerquery_parser_1.ResultUtils.boxOk(undefined);
+            return powerquery_parser_1.ResultUtils.ok(undefined);
         });
     }
     // eslint-disable-next-line require-await
     getSignatureHelp(_context) {
         return __awaiter(this, void 0, void 0, function* () {
-            return powerquery_parser_1.ResultUtils.boxOk(undefined);
+            return powerquery_parser_1.ResultUtils.ok(undefined);
         });
     }
 }

package/lib/powerquery-language-services/providers/nullSymbolProvider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"nullSymbolProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/nullSymbolProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oEAAgF;AAoBhF,0BAA2C;AAK3C,MAAa,kBAAkB;IAA/B;QASoB,yBAAoB,GAAyC,gBAAY,CAAC,wBAAwB,CAAC;QACnG,uBAAkB,GAA+B,IAAI,GAAG,EAAE,CAAC;IAiD/E,CAAC;IA7CU,MAAM,CAAC,SAAS;QACnB,IAAI,kBAAkB,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC3C,kBAAkB,CAAC,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;SAC1D;QAED,OAAO,kBAAkB,CAAC,QAAQ,CAAC;IACvC,CAAC;IAED,yCAAyC;IAC5B,oBAAoB,CAC7B,QAAyC;;YAEzC,OAAO,+BAAW,CAAC,~~KAAK~~,CAAC,SAAS,CAAC,CAAC;~~QACxC~~,CAAC;KAAA;IAED,yCAAyC;IAC5B,aAAa,CACtB,QAAmC;;YAEnC,OAAO,+BAAW,CAAC,~~KAAK~~,CAAC,SAAS,CAAC,CAAC;~~QACxC~~,CAAC;KAAA;IAED,yCAAyC;IAC5B,gBAAgB,CAAC,QAAyB;;YACnD,OAAO,+BAAW,CAAC,~~KAAK~~,CAAC,EAAE,CAAC,CAAC;~~QACjC~~,CAAC;KAAA;IAED,yCAAyC;IAC5B,QAAQ,CAAC,QAA8B;;YAChD,OAAO,+BAAW,CAAC,~~KAAK~~,CAAC,SAAS,CAAC,CAAC;~~QACxC~~,CAAC;KAAA;IAED,yCAAyC;IAC5B,wBAAwB,CACjC,QAAyB;;YAEzB,OAAO,+BAAW,CAAC,~~KAAK~~,CAAC,SAAS,CAAC,CAAC;~~QACxC~~,CAAC;KAAA;IAED,yCAAyC;IAC5B,gBAAgB,CACzB,QAAkC;;YAElC,OAAO,+BAAW,CAAC,~~KAAK~~,CAAC,SAAS,CAAC,CAAC;~~QACxC~~,CAAC;KAAA;CACJ;AA3DD,gDA2DC"}
1	+ {"version":3,"file":"nullSymbolProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/nullSymbolProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oEAAgF;AAoBhF,0BAA2C;AAK3C,MAAa,kBAAkB;IAA/B;QASoB,yBAAoB,GAAyC,gBAAY,CAAC,wBAAwB,CAAC;QACnG,uBAAkB,GAA+B,IAAI,GAAG,EAAE,CAAC;IAiD/E,CAAC;IA7CU,MAAM,CAAC,SAAS;QACnB,IAAI,kBAAkB,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC3C,kBAAkB,CAAC,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;SAC1D;QAED,OAAO,kBAAkB,CAAC,QAAQ,CAAC;IACvC,CAAC;IAED,yCAAyC;IAC5B,oBAAoB,CAC7B,QAAyC;;YAEzC,OAAO,+BAAW,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC;KAAA;IAED,yCAAyC;IAC5B,aAAa,CACtB,QAAmC;;YAEnC,OAAO,+BAAW,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC;KAAA;IAED,yCAAyC;IAC5B,gBAAgB,CAAC,QAAyB;;YACnD,OAAO,+BAAW,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9B,CAAC;KAAA;IAED,yCAAyC;IAC5B,QAAQ,CAAC,QAA8B;;YAChD,OAAO,+BAAW,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC;KAAA;IAED,yCAAyC;IAC5B,wBAAwB,CACjC,QAAyB;;YAEzB,OAAO,+BAAW,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC;KAAA;IAED,yCAAyC;IAC5B,gBAAgB,CACzB,QAAkC;;YAElC,OAAO,+BAAW,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC;KAAA;CACJ;AA3DD,gDA2DC"}

package/lib/powerquery-language-services/tokenPositionComparison.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+export declare enum TokenPositionComparison {
+    OnToken = "OnToken",
+    LeftOfToken = "LeftOfToken",
+    RightOfToken = "RightOfToken"
+}

package/lib/powerquery-language-services/tokenPositionComparison.js ADDED Viewed

@@ -0,0 +1,13 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenPositionComparison = void 0;
+// Used to indicate the relationship between a TokenPosition and a Position
+var TokenPositionComparison;
+(function (TokenPositionComparison) {
+    TokenPositionComparison["OnToken"] = "OnToken";
+    TokenPositionComparison["LeftOfToken"] = "LeftOfToken";
+    TokenPositionComparison["RightOfToken"] = "RightOfToken";
+})(TokenPositionComparison = exports.TokenPositionComparison || (exports.TokenPositionComparison = {}));
+//# sourceMappingURL=tokenPositionComparison.js.map

package/lib/powerquery-language-services/tokenPositionComparison.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"tokenPositionComparison.js","sourceRoot":"","sources":["../../src/powerquery-language-services/tokenPositionComparison.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,2EAA2E;AAC3E,IAAY,uBAIX;AAJD,WAAY,uBAAuB;IAC/B,8CAAmB,CAAA;IACnB,sDAA2B,CAAA;IAC3B,wDAA6B,CAAA;AACjC,CAAC,EAJW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAIlC"}

package/lib/powerquery-language-services/trace.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
-export declare const enum AutocompleteTraceConstant {
+export declare enum AutocompleteTraceConstant {
     Autocomplete = "Autocomplete",
     AutocompleteFieldAccess = "FieldAccess",
     AutocompleteKeyword = "Keyword",
     AutocompleteLanguageConstant = "LanguageConstant",
     AutocompletePrimitiveType = "PrimitiveType"
 }
-export declare const enum InspectionTraceConstant {
+export declare enum InspectionTraceConstant {
     Inspect = "Inspect",
     InspectCurrentInvokeExpression = "Inspection.CurrentInvokeExpression",
     InspectExpectedType = "Inspection.ExpectedType",
@@ -16,12 +16,12 @@ export declare const enum InspectionTraceConstant {
     InspectType = "Inspection.Type",
     InspectionUtils = "InspectionUtils"
 }
-export declare const enum ProviderTraceConstant {
+export declare enum ProviderTraceConstant {
     LanguageCompletionProvider = "LanguageCompletionProvider",
     LibrarySymbolProvider = "LibrarySymbolProvider",
     LocalDocumentSymbolProvider = "LocalDocumentSymbolProvider"
 }
-export declare const enum ValidationTraceConstant {
+export declare enum ValidationTraceConstant {
     AnalysisBase = "AnalysisBase",
     Validation = "Validation"
 }

package/lib/powerquery-language-services/trace.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/powerquery-language-services/trace.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,~~IAAkB~~,~~yBAMjB~~;AAND,~~WAAkB~~,yBAAyB;~~IACvC~~,0DAA6B,CAAA;IAC7B,oEAAuC,CAAA;IACvC,4DAA+B,CAAA;IAC/B,8EAAiD,CAAA;IACjD,wEAA2C,CAAA;AAC/C,CAAC,~~EANiB~~,yBAAyB,GAAzB,iCAAyB,KAAzB,iCAAyB,~~QAM1C~~;AAED,~~IAAkB~~,~~uBAUjB~~;AAVD,~~WAAkB~~,uBAAuB;~~IACrC~~,8CAAmB,CAAA;IACnB,gGAAqE,CAAA;IACrE,0EAA+C,CAAA;IAC/C,kFAAuD,CAAA;IACvD,4DAAiC,CAAA;IACjC,oEAAyC,CAAA;IACzC,oEAAyC,CAAA;IACzC,0DAA+B,CAAA;IAC/B,8DAAmC,CAAA;AACvC,CAAC,~~EAViB~~,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,~~QAUxC~~;AAED,~~IAAkB~~,~~qBAIjB~~;AAJD,~~WAAkB~~,qBAAqB;~~IACnC~~,kFAAyD,CAAA;IACzD,wEAA+C,CAAA;IAC/C,oFAA2D,CAAA;AAC/D,CAAC,~~EAJiB~~,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,~~QAItC~~;AAED,~~IAAkB~~,~~uBAGjB~~;AAHD,~~WAAkB~~,uBAAuB;~~IACrC~~,wDAA6B,CAAA;IAC7B,oDAAyB,CAAA;AAC7B,CAAC,~~EAHiB~~,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,~~QAGxC~~"}
1	+ {"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/powerquery-language-services/trace.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,IAAY,yBAMX;AAND,WAAY,yBAAyB;IACjC,0DAA6B,CAAA;IAC7B,oEAAuC,CAAA;IACvC,4DAA+B,CAAA;IAC/B,8EAAiD,CAAA;IACjD,wEAA2C,CAAA;AAC/C,CAAC,EANW,yBAAyB,GAAzB,iCAAyB,KAAzB,iCAAyB,QAMpC;AAED,IAAY,uBAUX;AAVD,WAAY,uBAAuB;IAC/B,8CAAmB,CAAA;IACnB,gGAAqE,CAAA;IACrE,0EAA+C,CAAA;IAC/C,kFAAuD,CAAA;IACvD,4DAAiC,CAAA;IACjC,oEAAyC,CAAA;IACzC,oEAAyC,CAAA;IACzC,0DAA+B,CAAA;IAC/B,8DAAmC,CAAA;AACvC,CAAC,EAVW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAUlC;AAED,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC7B,kFAAyD,CAAA;IACzD,wEAA+C,CAAA;IAC/C,oFAA2D,CAAA;AAC/D,CAAC,EAJW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAIhC;AAED,IAAY,uBAGX;AAHD,WAAY,uBAAuB;IAC/B,wDAA6B,CAAA;IAC7B,oDAAyB,CAAA;AAC7B,CAAC,EAHW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAGlC"}

package/lib/powerquery-language-services/traceUtils.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { Ast, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
-export declare function createTypeDetails(powerQueryType: Type.TPowerQueryType): TypeDetails;
-export declare function createXorNodeDetails(xorNode: TXorNode): XorNodeDetails;
+export declare function typeDetails(powerQueryType: Type.TPowerQueryType): TypeDetails;
+export declare function xorNodeDetails(xorNode: TXorNode): XorNodeDetails;
 interface TypeDetails {
     readonly kind: Type.TypeKind;
     readonly extendedType: Type.ExtendedTypeKind | undefined;

package/lib/powerquery-language-services/traceUtils.js CHANGED Viewed

@@ -2,20 +2,20 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createXorNodeDetails = exports.createTypeDetails = void 0;
-function createTypeDetails(powerQueryType) {
+exports.xorNodeDetails = exports.typeDetails = void 0;
+function typeDetails(powerQueryType) {
     return {
         kind: powerQueryType.kind,
         extendedType: powerQueryType.extendedKind,
         isNullable: powerQueryType.isNullable,
     };
 }
-exports.createTypeDetails = createTypeDetails;
-function createXorNodeDetails(xorNode) {
+exports.typeDetails = typeDetails;
+function xorNodeDetails(xorNode) {
     return {
         nodeKind: xorNode.node.kind,
         nodeId: xorNode.node.id,
     };
 }
-exports.createXorNodeDetails = createXorNodeDetails;
+exports.xorNodeDetails = xorNodeDetails;
 //# sourceMappingURL=traceUtils.js.map

package/lib/powerquery-language-services/traceUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"traceUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/traceUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,SAAgB,~~iBAAiB~~,CAAC,cAAoC;~~IAClE~~,OAAO;QACH,IAAI,EAAE,cAAc,CAAC,IAAI;QACzB,YAAY,EAAE,cAAc,CAAC,YAAY;QACzC,UAAU,EAAE,cAAc,CAAC,UAAU;KACxC,CAAC;AACN,CAAC;AAND,~~8CAMC~~;AAED,SAAgB,~~oBAAoB~~,CAAC,OAAiB;~~IAClD~~,OAAO;QACH,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI;QAC3B,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;KAC1B,CAAC;AACN,CAAC;AALD,~~oDAKC~~"}
1	+ {"version":3,"file":"traceUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/traceUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,SAAgB,WAAW,CAAC,cAAoC;IAC5D,OAAO;QACH,IAAI,EAAE,cAAc,CAAC,IAAI;QACzB,YAAY,EAAE,cAAc,CAAC,YAAY;QACzC,UAAU,EAAE,cAAc,CAAC,UAAU;KACxC,CAAC;AACN,CAAC;AAND,kCAMC;AAED,SAAgB,cAAc,CAAC,OAAiB;IAC5C,OAAO;QACH,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI;QAC3B,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;KAC1B,CAAC;AACN,CAAC;AALD,wCAKC"}

package/lib/powerquery-language-services/validate/validate.js CHANGED Viewed

@@ -19,13 +19,14 @@ const validateFunctionExpression_1 = require("./validateFunctionExpression");
 const validateInvokeExpression_1 = require("./validateInvokeExpression");
 const validateParse_1 = require("./validateParse");
 const validateUnknownIdentifiers_1 = require("./validateUnknownIdentifiers");
+const trace_1 = require("../trace");
 function validate(textDocument, analysisSettings, validationSettings) {
     return powerquery_parser_1.ResultUtils.ensureResultAsync(() => __awaiter(this, void 0, void 0, function* () {
-        const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validate.name, validationSettings.initialCorrelationId);
+        const trace = validationSettings.traceManager.entry(trace_1.ValidationTraceConstant.Validation, validate.name, validationSettings.initialCorrelationId);
         const updatedSettings = Object.assign(Object.assign({}, validationSettings), { initialCorrelationId: trace.id });
-        const analysis = analysis_1.AnalysisUtils.createAnalysis(textDocument, analysisSettings);
-        const parseState = yield analysis.getParseState();
-        const parseError = yield analysis.getParseError();
+        const analysis = analysis_1.AnalysisUtils.analysis(textDocument, analysisSettings);
+        const parseState = powerquery_parser_1.ResultUtils.assertOk(yield analysis.getParseState());
+        const parseError = powerquery_parser_1.ResultUtils.assertOk(yield analysis.getParseError());
         if (parseState === undefined) {
             trace.exit();
             return undefined;
@@ -57,7 +58,7 @@ function validate(textDocument, analysisSettings, validationSettings) {
                 ...invokeExpressionDiagnostics,
                 ...unknownIdentifiersDiagnostics,
             ],
-            hasSyntaxError: Boolean(yield analysis.getParseError()),
+            hasSyntaxError: parseError !== undefined,
         };
         trace.exit();
         return result;

package/lib/powerquery-language-services/validate/validate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAOlC,0CAAwE;AACxE,oEAAgF;AAEhF,iFAA8E;AAC9E,6EAA0E;AAC1E,yEAAsE;AAEtE,mDAAgD;AAChD,6EAA0E;~~AAI1E~~,SAAgB,QAAQ,CACpB,YAA0B,EAC1B,gBAAkC,EAClC,kBAAsC;IAEtC,OAAO,+BAAW,CAAC,iBAAiB,CAAC,GAAS,EAAE;QAC5C,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,~~gCAEtD~~,QAAQ,CAAC,IAAI,EACb,kBAAkB,CAAC,oBAAoB,CAC1C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;QAEF,MAAM,QAAQ,GAAa,wBAAa,CAAC,~~cAAc~~,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;~~QACxF~~,MAAM,UAAU,GAA2B,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC;~~QAC1E~~,MAAM,UAAU,GAAsC,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC;~~QAErF~~,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,6BAA2C,CAAC;QAChD,IAAI,2BAAyC,CAAC;QAC9C,IAAI,6BAA2C,CAAC;QAEhD,MAAM,mBAAmB,GAAyB,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAC9F,MAAM,SAAS,GAAc,QAAQ,CAAC,YAAY,EAAE,CAAC;QAErD,IAAI,kBAAkB,CAAC,sBAAsB,IAAI,mBAAmB,EAAE;YAClE,6BAA6B,GAAG,IAAA,uDAA0B,EAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;YAEpG,2BAA2B,GAAG,MAAM,IAAA,mDAAwB,EACxD,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,CACZ,CAAC;SACL;aAAM;YACH,6BAA6B,GAAG,EAAE,CAAC;YACnC,2BAA2B,GAAG,EAAE,CAAC;SACpC;QAED,IAAI,kBAAkB,CAAC,uBAAuB,IAAI,mBAAmB,EAAE;YACnE,6BAA6B,GAAG,MAAM,IAAA,uDAA0B,EAC5D,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,CACZ,CAAC;SACL;aAAM;YACH,6BAA6B,GAAG,EAAE,CAAC;SACtC;QAED,MAAM,MAAM,GAAe;YACvB,WAAW,EAAE;gBACT,GAAG,IAAA,2DAA4B,EAC3B,YAAY,EACZ,mBAAmB,EACnB,eAAe,EACf,kBAAkB,CAAC,iBAAiB,CACvC;gBACD,GAAG,CAAC,MAAM,IAAA,6BAAa,EAAC,UAAU,EAAE,eAAe,CAAC,CAAC;gBACrD,GAAG,6BAA6B;gBAChC,GAAG,2BAA2B;gBAC9B,GAAG,6BAA6B;aACnC;YACD,cAAc,EAAE,~~OAAO~~,~~CAAC~~,~~MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC~~;~~SAC1D~~,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC,CAAA,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;AAClC,CAAC;AA7ED,4BA6EC"}
1	+ {"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAOlC,0CAAwE;AACxE,oEAAgF;AAEhF,iFAA8E;AAC9E,6EAA0E;AAC1E,yEAAsE;AAEtE,mDAAgD;AAChD,6EAA0E;AAE1E,oCAAmD;AAEnD,SAAgB,QAAQ,CACpB,YAA0B,EAC1B,gBAAkC,EAClC,kBAAsC;IAEtC,OAAO,+BAAW,CAAC,iBAAiB,CAAC,GAAS,EAAE;QAC5C,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,UAAU,EAClC,QAAQ,CAAC,IAAI,EACb,kBAAkB,CAAC,oBAAoB,CAC1C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;QAEF,MAAM,QAAQ,GAAa,wBAAa,CAAC,QAAQ,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;QAClF,MAAM,UAAU,GAA2B,+BAAW,CAAC,QAAQ,CAAC,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;QAChG,MAAM,UAAU,GAAsC,+BAAW,CAAC,QAAQ,CAAC,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;QAE3G,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,6BAA2C,CAAC;QAChD,IAAI,2BAAyC,CAAC;QAC9C,IAAI,6BAA2C,CAAC;QAEhD,MAAM,mBAAmB,GAAyB,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAC9F,MAAM,SAAS,GAAc,QAAQ,CAAC,YAAY,EAAE,CAAC;QAErD,IAAI,kBAAkB,CAAC,sBAAsB,IAAI,mBAAmB,EAAE;YAClE,6BAA6B,GAAG,IAAA,uDAA0B,EAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;YAEpG,2BAA2B,GAAG,MAAM,IAAA,mDAAwB,EACxD,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,CACZ,CAAC;SACL;aAAM;YACH,6BAA6B,GAAG,EAAE,CAAC;YACnC,2BAA2B,GAAG,EAAE,CAAC;SACpC;QAED,IAAI,kBAAkB,CAAC,uBAAuB,IAAI,mBAAmB,EAAE;YACnE,6BAA6B,GAAG,MAAM,IAAA,uDAA0B,EAC5D,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,CACZ,CAAC;SACL;aAAM;YACH,6BAA6B,GAAG,EAAE,CAAC;SACtC;QAED,MAAM,MAAM,GAAe;YACvB,WAAW,EAAE;gBACT,GAAG,IAAA,2DAA4B,EAC3B,YAAY,EACZ,mBAAmB,EACnB,eAAe,EACf,kBAAkB,CAAC,iBAAiB,CACvC;gBACD,GAAG,CAAC,MAAM,IAAA,6BAAa,EAAC,UAAU,EAAE,eAAe,CAAC,CAAC;gBACrD,GAAG,6BAA6B;gBAChC,GAAG,2BAA2B;gBAC9B,GAAG,6BAA6B;aACnC;YACD,cAAc,EAAE,UAAU,KAAK,SAAS;SAC3C,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC,CAAA,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;AAClC,CAAC;AA7ED,4BA6EC"}

package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js CHANGED Viewed

@@ -6,11 +6,13 @@ exports.validateDuplicateIdentifiers = void 0;
 const PQP = require("@microsoft/powerquery-parser");
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const localization_1 = require("../localization");
 const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
 const __1 = require("..");
+const trace_1 = require("../trace");
 function validateDuplicateIdentifiers(textDocument, nodeIdMapCollection, validationSettings, cancellationToken) {
-    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiers.name, validationSettings.initialCorrelationId);
+    const trace = validationSettings.traceManager.entry(trace_1.ValidationTraceConstant.Validation, validateDuplicateIdentifiers.name, validationSettings.initialCorrelationId);
     const updatedSettings = Object.assign(Object.assign({}, validationSettings), { initialCorrelationId: trace.id });
     if (!updatedSettings.checkForDuplicateIdentifiers) {
         trace.exit();
@@ -29,18 +31,18 @@ function validateDuplicateIdentifiers(textDocument, nodeIdMapCollection, validat
 exports.validateDuplicateIdentifiers = validateDuplicateIdentifiers;
 function validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings, correlationId, cancellationToken) {
     var _a;
-    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForLetExpresion.name, correlationId);
-    const letIds = (_a = nodeIdMapCollection.idsByNodeKind.get("LetExpression" /* LetExpression */)) !== null && _a !== void 0 ? _a : new Set();
+    const trace = validationSettings.traceManager.entry(trace_1.ValidationTraceConstant.Validation, validateDuplicateIdentifiersForLetExpresion.name, correlationId);
+    const letIds = (_a = nodeIdMapCollection.idsByNodeKind.get(language_1.Ast.NodeKind.LetExpression)) !== null && _a !== void 0 ? _a : new Set();
     const result = validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, [letIds], parser_1.NodeIdMapIterator.iterLetExpression, validationSettings, trace.id, cancellationToken);
     trace.exit();
     return result;
 }
 function validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, validationSettings, correlationId, cancellationToken) {
     var _a, _b;
-    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForRecord.name, correlationId);
+    const trace = validationSettings.traceManager.entry(trace_1.ValidationTraceConstant.Validation, validateDuplicateIdentifiersForRecord.name, correlationId);
     const recordIds = [
-        (_a = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _a !== void 0 ? _a : new Set(),
-        (_b = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _b !== void 0 ? _b : new Set(),
+        (_a = nodeIdMapCollection.idsByNodeKind.get(language_1.Ast.NodeKind.RecordExpression)) !== null && _a !== void 0 ? _a : new Set(),
+        (_b = nodeIdMapCollection.idsByNodeKind.get(language_1.Ast.NodeKind.RecordLiteral)) !== null && _b !== void 0 ? _b : new Set(),
     ];
     const result = validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, parser_1.NodeIdMapIterator.iterRecord, validationSettings, trace.id, cancellationToken);
     trace.exit();
@@ -48,9 +50,9 @@ function validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection,
 }
 function validateDuplicateIdentifiersForRecordType(documentUri, nodeIdMapCollection, validationSettings, correlationId, cancellationToken) {
     var _a;
-    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForRecordType.name, correlationId);
+    const trace = validationSettings.traceManager.entry(trace_1.ValidationTraceConstant.Validation, validateDuplicateIdentifiersForRecordType.name, correlationId);
     const recordTypeIds = [
-        (_a = nodeIdMapCollection.idsByNodeKind.get("RecordType" /* RecordType */)) !== null && _a !== void 0 ? _a : new Set(),
+        (_a = nodeIdMapCollection.idsByNodeKind.get(language_1.Ast.NodeKind.RecordType)) !== null && _a !== void 0 ? _a : new Set(),
     ];
     const result = validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordTypeIds, parser_1.NodeIdMapIterator.iterRecordType, validationSettings, trace.id, cancellationToken);
     trace.exit();
@@ -58,8 +60,8 @@ function validateDuplicateIdentifiersForRecordType(documentUri, nodeIdMapCollect
 }
 function validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, validationSettings, correlationId, cancellationToken) {
     var _a;
-    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForSection.name, correlationId);
-    const sectionIds = (_a = nodeIdMapCollection.idsByNodeKind.get("Section" /* Section */)) !== null && _a !== void 0 ? _a : new Set();
+    const trace = validationSettings.traceManager.entry(trace_1.ValidationTraceConstant.Validation, validateDuplicateIdentifiersForSection.name, correlationId);
+    const sectionIds = (_a = nodeIdMapCollection.idsByNodeKind.get(language_1.Ast.NodeKind.Section)) !== null && _a !== void 0 ? _a : new Set();
     const result = validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, [sectionIds], parser_1.NodeIdMapIterator.iterSection, validationSettings, trace.id, cancellationToken);
     trace.exit();
     return result;
@@ -70,7 +72,7 @@ function validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection
 //          ...
 function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, nodeIdCollections, iterNodeFactory, validationSettings, correlationId, cancellationToken) {
     const numIds = nodeIdCollections.reduce((partial, set) => partial + set.size, 0);
-    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForKeyValuePair.name, correlationId, { numIds });
+    const trace = validationSettings.traceManager.entry(trace_1.ValidationTraceConstant.Validation, validateDuplicateIdentifiersForKeyValuePair.name, correlationId, { numIds });
     if (!numIds) {
         return [];
     }
@@ -78,7 +80,7 @@ function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapColle
     for (const collection of nodeIdCollections) {
         for (const nodeId of collection) {
             cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.throwIfCancelled();
-            const node = parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId);
+            const node = parser_1.NodeIdMapUtils.assertXor(nodeIdMapCollection, nodeId);
             const duplicateFieldsByKey = new Map();
             const knownFieldByKey = new Map();
             for (const field of iterNodeFactory(nodeIdMapCollection, node)) {
@@ -100,7 +102,7 @@ function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapColle
                 const asRelatedInformation = duplicates.map((keyValuePair) => ({
                     location: {
                         uri: documentUri,
-                        range: __1.PositionUtils.createRangeFromTokenRange(keyValuePair.key.tokenRange),
+                        range: __1.PositionUtils.rangeFromTokenRange(keyValuePair.key.tokenRange),
                     },
                     message: createDuplicateIdentifierDiagnosticMessage(keyValuePair, validationSettings),
                 }));
@@ -120,7 +122,7 @@ function createDuplicateIdentifierDiagnostic(keyValuePair, relatedInformation, v
     return {
         code: diagnosticErrorCode_1.DiagnosticErrorCode.DuplicateIdentifier,
         message: createDuplicateIdentifierDiagnosticMessage(keyValuePair, validationSettings),
-        range: __1.PositionUtils.createRangeFromTokenRange(keyValuePair.key.tokenRange),
+        range: __1.PositionUtils.rangeFromTokenRange(keyValuePair.key.tokenRange),
         relatedInformation,
         severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
         source: validationSettings.source,

package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,oDAAoD;AACpD,6EAAwH;AACxH,sFAKmE;~~AAMnE~~,kDAAkE;AAClE,gEAA6D;AAC7D,0BAAmC;~~AAInC~~,SAAgB,4BAA4B,CACxC,YAA0B,EAC1B,mBAAyC,EACzC,kBAAsC,EACtC,iBAAiD;IAEjD,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,~~gCAEtD~~,4BAA4B,CAAC,IAAI,EACjC,kBAAkB,CAAC,oBAAoB,CAC1C,CAAC;IAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;IAEF,IAAI,CAAC,eAAe,CAAC,4BAA4B,EAAE;QAC/C,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,EAAE,CAAC;KACb;IAED,MAAM,WAAW,GAAW,YAAY,CAAC,GAAG,CAAC;IAE7C,MAAM,MAAM,GAA8B;QACtC,GAAG,2CAA2C,CAC1C,WAAW,EACX,mBAAmB,EACnB,eAAe,EACf,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB;QACD,GAAG,qCAAqC,CACpC,WAAW,EACX,mBAAmB,EACnB,eAAe,EACf,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB;QACD,GAAG,yCAAyC,CACxC,WAAW,EACX,mBAAmB,EACnB,eAAe,EACf,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB;QACD,GAAG,sCAAsC,CACrC,WAAW,EACX,mBAAmB,EACnB,eAAe,EACf,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB;KACJ,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AA3DD,oEA2DC;AAED,SAAS,2CAA2C,CAChD,WAAwB,EACxB,mBAAyC,EACzC,kBAAsC,EACtC,aAAqB,EACrB,iBAAiD;;IAEjD,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,~~gCAEtD~~,2CAA2C,CAAC,IAAI,EAChD,aAAa,CAChB,CAAC;IAEF,MAAM,MAAM,GAAgB,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,~~qCAA4B~~,mCAAI,IAAI,GAAG,EAAE,CAAC;IAE3G,MAAM,MAAM,GAA8B,2CAA2C,CACjF,WAAW,EACX,mBAAmB,EACnB,CAAC,MAAM,CAAC,EACR,0BAAiB,CAAC,iBAAiB,EACnC,kBAAkB,EAClB,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,qCAAqC,CAC1C,WAAwB,EACxB,mBAAyC,EACzC,kBAAsC,EACtC,aAAqB,EACrB,iBAAiD;;IAEjD,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,~~gCAEtD~~,qCAAqC,CAAC,IAAI,EAC1C,aAAa,CAChB,CAAC;IAEF,MAAM,SAAS,GAA+B;QAC1C,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,~~2CAA+B~~,mCAAI,IAAI,GAAG,EAAE;QACjF,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,~~qCAA4B~~,mCAAI,IAAI,GAAG,EAAE;KACjF,CAAC;IAEF,MAAM,MAAM,GAA8B,2CAA2C,CACjF,WAAW,EACX,mBAAmB,EACnB,SAAS,EACT,0BAAiB,CAAC,UAAU,EAC5B,kBAAkB,EAClB,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,yCAAyC,CAC9C,WAAwB,EACxB,mBAAyC,EACzC,kBAAsC,EACtC,aAAqB,EACrB,iBAAiD;;IAEjD,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,~~gCAEtD~~,yCAAyC,CAAC,IAAI,EAC9C,aAAa,CAChB,CAAC;IAEF,MAAM,aAAa,GAA+B;QAC9C,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG~~,+BAAyB~~,mCAAI,IAAI,GAAG,EAAE;KAC9E,CAAC;IAEF,MAAM,MAAM,GAA8B,2CAA2C,CACjF,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,0BAAiB,CAAC,cAAc,EAChC,kBAAkB,EAClB,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,sCAAsC,CAC3C,WAAwB,EACxB,mBAAyC,EACzC,kBAAsC,EACtC,aAAqB,EACrB,iBAAiD;;IAEjD,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,~~gCAEtD~~,sCAAsC,CAAC,IAAI,EAC3C,aAAa,CAChB,CAAC;IAEF,MAAM,UAAU,GAAgB,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,~~yBAAsB~~,mCAAI,IAAI,GAAG,EAAU,CAAC;IAEjH,MAAM,MAAM,GAA8B,2CAA2C,CACjF,WAAW,EACX,mBAAmB,EACnB,CAAC,UAAU,CAAC,EACZ,0BAAiB,CAAC,WAAW,EAC7B,kBAAkB,EAClB,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,iGAAiG;AACjG,wBAAwB;AACxB,iDAAiD;AACjD,eAAe;AACf,SAAS,2CAA2C,CAChD,WAAwB,EACxB,mBAAyC,EACzC,iBAA6C,EAC7C,eAGmD,EACnD,kBAAsC,EACtC,aAAqB,EACrB,iBAAiD;IAEjD,MAAM,MAAM,GAAW,iBAAiB,CAAC,MAAM,CAC3C,CAAC,OAAe,EAAE,GAAgB,EAAE,EAAE,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI,EACzD,CAAC,CACJ,CAAC;IAEF,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,~~gCAEtD~~,2CAA2C,CAAC,IAAI,EAChD,aAAa,EACb,EAAE,MAAM,EAAE,CACb,CAAC;IAEF,IAAI,CAAC,MAAM,EAAE;QACT,OAAO,EAAE,CAAC;KACb;IAED,MAAM,MAAM,GAAiB,EAAE,CAAC;IAEhC,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE;QACxC,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAC7B,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,gBAAgB,EAAE,CAAC;YAEtC,MAAM,IAAI,GAAa,uBAAc,CAAC,~~YAAY~~,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;~~YAChF~~,MAAM,oBAAoB,GAAmD,IAAI,GAAG,EAAE,CAAC;YACvF,MAAM,eAAe,GAAiD,IAAI,GAAG,EAAE,CAAC;YAEhF,KAAK,MAAM,KAAK,IAAI,eAAe,CAAC,mBAAmB,EAAE,IAAI,CAAC,EAAE;gBAC5D,MAAM,UAAU,GAAW,KAAK,CAAC,oBAAoB,CAAC;gBAEtD,MAAM,eAAe,GACjB,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAEzC,MAAM,SAAS,GAAgD,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAE/F,IAAI,eAAe,EAAE;oBACjB,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC/B;qBAAM,IAAI,SAAS,EAAE;oBAClB,oBAAoB,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;iBAC5D;qBAAM;oBACH,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;iBAC1C;aACJ;YAED,KAAK,MAAM,UAAU,IAAI,oBAAoB,CAAC,MAAM,EAAE,EAAE;gBACpD,MAAM,SAAS,GAAW,UAAU,CAAC,MAAM,CAAC;gBAE5C,MAAM,oBAAoB,GAAmC,UAAU,CAAC,GAAG,CACvE,CAAC,YAA6C,EAAE,EAAE,CAAC,CAAC;oBAChD,QAAQ,EAAE;wBACN,GAAG,EAAE,WAAW;wBAChB,KAAK,EAAE,iBAAa,CAAC,~~yBAAyB~~,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC;~~qBAC9E~~;oBACD,OAAO,EAAE,0CAA0C,CAAC,YAAY,EAAE,kBAAkB,CAAC;iBACxF,CAAC,CACL,CAAC;gBAEF,KAAK,IAAI,KAAK,GAAW,CAAC,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,IAAI,CAAC,EAAE;oBACvD,MAAM,SAAS,GAAoC,UAAU,CAAC,KAAK,CAAC,CAAC;oBAErE,8FAA8F;oBAC9F,MAAM,kBAAkB,GAAmC,oBAAoB,CAAC,MAAM,CAClF,CAAC,CAA+B,EAAE,YAAoB,EAAE,EAAE,CAAC,KAAK,KAAK,YAAY,CACpF,CAAC;oBAEF,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,SAAS,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CAAC;iBACvG;aACJ;SACJ;KACJ;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,mCAAmC,CACxC,YAA6C,EAC7C,kBAAkD,EAClD,kBAAsC;IAEtC,OAAO;QACH,IAAI,EAAE,yCAAmB,CAAC,mBAAmB;QAC7C,OAAO,EAAE,0CAA0C,CAAC,YAAY,EAAE,kBAAkB,CAAC;QACrF,KAAK,EAAE,iBAAa,CAAC,~~yBAAyB~~,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC;~~QAC3E~~,kBAAkB;QAClB,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC;AACN,CAAC;AAED,SAAS,0CAA0C,CAC/C,YAA6C,EAC7C,kBAAsC;;IAEtC,OAAO,2BAAY,CAAC,qCAAqC,CACrD,gCAAiB,CAAC,wBAAwB,CAAC,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM,mCAAI,GAAG,CAAC,aAAa,CAAC,EAC3F,YAAY,CAAC,UAAU,CAC1B,CAAC;AACN,CAAC"}
1	+ {"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,oDAAoD;AACpD,6EAAwH;AACxH,sFAKmE;AACnE,0FAAkF;AAKlF,kDAAkE;AAClE,gEAA6D;AAC7D,0BAAmC;AAEnC,oCAAmD;AAEnD,SAAgB,4BAA4B,CACxC,YAA0B,EAC1B,mBAAyC,EACzC,kBAAsC,EACtC,iBAAiD;IAEjD,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,UAAU,EAClC,4BAA4B,CAAC,IAAI,EACjC,kBAAkB,CAAC,oBAAoB,CAC1C,CAAC;IAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;IAEF,IAAI,CAAC,eAAe,CAAC,4BAA4B,EAAE;QAC/C,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,EAAE,CAAC;KACb;IAED,MAAM,WAAW,GAAW,YAAY,CAAC,GAAG,CAAC;IAE7C,MAAM,MAAM,GAA8B;QACtC,GAAG,2CAA2C,CAC1C,WAAW,EACX,mBAAmB,EACnB,eAAe,EACf,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB;QACD,GAAG,qCAAqC,CACpC,WAAW,EACX,mBAAmB,EACnB,eAAe,EACf,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB;QACD,GAAG,yCAAyC,CACxC,WAAW,EACX,mBAAmB,EACnB,eAAe,EACf,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB;QACD,GAAG,sCAAsC,CACrC,WAAW,EACX,mBAAmB,EACnB,eAAe,EACf,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB;KACJ,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AA3DD,oEA2DC;AAED,SAAS,2CAA2C,CAChD,WAAwB,EACxB,mBAAyC,EACzC,kBAAsC,EACtC,aAAqB,EACrB,iBAAiD;;IAEjD,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,UAAU,EAClC,2CAA2C,CAAC,IAAI,EAChD,aAAa,CAChB,CAAC;IAEF,MAAM,MAAM,GAAgB,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAAC,cAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,mCAAI,IAAI,GAAG,EAAE,CAAC;IAE3G,MAAM,MAAM,GAA8B,2CAA2C,CACjF,WAAW,EACX,mBAAmB,EACnB,CAAC,MAAM,CAAC,EACR,0BAAiB,CAAC,iBAAiB,EACnC,kBAAkB,EAClB,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,qCAAqC,CAC1C,WAAwB,EACxB,mBAAyC,EACzC,kBAAsC,EACtC,aAAqB,EACrB,iBAAiD;;IAEjD,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,UAAU,EAClC,qCAAqC,CAAC,IAAI,EAC1C,aAAa,CAChB,CAAC;IAEF,MAAM,SAAS,GAA+B;QAC1C,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAAC,cAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,mCAAI,IAAI,GAAG,EAAE;QACjF,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAAC,cAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,mCAAI,IAAI,GAAG,EAAE;KACjF,CAAC;IAEF,MAAM,MAAM,GAA8B,2CAA2C,CACjF,WAAW,EACX,mBAAmB,EACnB,SAAS,EACT,0BAAiB,CAAC,UAAU,EAC5B,kBAAkB,EAClB,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,yCAAyC,CAC9C,WAAwB,EACxB,mBAAyC,EACzC,kBAAsC,EACtC,aAAqB,EACrB,iBAAiD;;IAEjD,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,UAAU,EAClC,yCAAyC,CAAC,IAAI,EAC9C,aAAa,CAChB,CAAC;IAEF,MAAM,aAAa,GAA+B;QAC9C,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAAC,cAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,mCAAI,IAAI,GAAG,EAAE;KAC9E,CAAC;IAEF,MAAM,MAAM,GAA8B,2CAA2C,CACjF,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,0BAAiB,CAAC,cAAc,EAChC,kBAAkB,EAClB,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,sCAAsC,CAC3C,WAAwB,EACxB,mBAAyC,EACzC,kBAAsC,EACtC,aAAqB,EACrB,iBAAiD;;IAEjD,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,UAAU,EAClC,sCAAsC,CAAC,IAAI,EAC3C,aAAa,CAChB,CAAC;IAEF,MAAM,UAAU,GAAgB,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAAC,cAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,mCAAI,IAAI,GAAG,EAAU,CAAC;IAEjH,MAAM,MAAM,GAA8B,2CAA2C,CACjF,WAAW,EACX,mBAAmB,EACnB,CAAC,UAAU,CAAC,EACZ,0BAAiB,CAAC,WAAW,EAC7B,kBAAkB,EAClB,KAAK,CAAC,EAAE,EACR,iBAAiB,CACpB,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,iGAAiG;AACjG,wBAAwB;AACxB,iDAAiD;AACjD,eAAe;AACf,SAAS,2CAA2C,CAChD,WAAwB,EACxB,mBAAyC,EACzC,iBAA6C,EAC7C,eAGmD,EACnD,kBAAsC,EACtC,aAAqB,EACrB,iBAAiD;IAEjD,MAAM,MAAM,GAAW,iBAAiB,CAAC,MAAM,CAC3C,CAAC,OAAe,EAAE,GAAgB,EAAE,EAAE,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI,EACzD,CAAC,CACJ,CAAC;IAEF,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,UAAU,EAClC,2CAA2C,CAAC,IAAI,EAChD,aAAa,EACb,EAAE,MAAM,EAAE,CACb,CAAC;IAEF,IAAI,CAAC,MAAM,EAAE;QACT,OAAO,EAAE,CAAC;KACb;IAED,MAAM,MAAM,GAAiB,EAAE,CAAC;IAEhC,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE;QACxC,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAC7B,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,gBAAgB,EAAE,CAAC;YAEtC,MAAM,IAAI,GAAa,uBAAc,CAAC,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC7E,MAAM,oBAAoB,GAAmD,IAAI,GAAG,EAAE,CAAC;YACvF,MAAM,eAAe,GAAiD,IAAI,GAAG,EAAE,CAAC;YAEhF,KAAK,MAAM,KAAK,IAAI,eAAe,CAAC,mBAAmB,EAAE,IAAI,CAAC,EAAE;gBAC5D,MAAM,UAAU,GAAW,KAAK,CAAC,oBAAoB,CAAC;gBAEtD,MAAM,eAAe,GACjB,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAEzC,MAAM,SAAS,GAAgD,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAE/F,IAAI,eAAe,EAAE;oBACjB,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC/B;qBAAM,IAAI,SAAS,EAAE;oBAClB,oBAAoB,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;iBAC5D;qBAAM;oBACH,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;iBAC1C;aACJ;YAED,KAAK,MAAM,UAAU,IAAI,oBAAoB,CAAC,MAAM,EAAE,EAAE;gBACpD,MAAM,SAAS,GAAW,UAAU,CAAC,MAAM,CAAC;gBAE5C,MAAM,oBAAoB,GAAmC,UAAU,CAAC,GAAG,CACvE,CAAC,YAA6C,EAAE,EAAE,CAAC,CAAC;oBAChD,QAAQ,EAAE;wBACN,GAAG,EAAE,WAAW;wBAChB,KAAK,EAAE,iBAAa,CAAC,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC;qBACxE;oBACD,OAAO,EAAE,0CAA0C,CAAC,YAAY,EAAE,kBAAkB,CAAC;iBACxF,CAAC,CACL,CAAC;gBAEF,KAAK,IAAI,KAAK,GAAW,CAAC,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,IAAI,CAAC,EAAE;oBACvD,MAAM,SAAS,GAAoC,UAAU,CAAC,KAAK,CAAC,CAAC;oBAErE,8FAA8F;oBAC9F,MAAM,kBAAkB,GAAmC,oBAAoB,CAAC,MAAM,CAClF,CAAC,CAA+B,EAAE,YAAoB,EAAE,EAAE,CAAC,KAAK,KAAK,YAAY,CACpF,CAAC;oBAEF,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,SAAS,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CAAC;iBACvG;aACJ;SACJ;KACJ;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,mCAAmC,CACxC,YAA6C,EAC7C,kBAAkD,EAClD,kBAAsC;IAEtC,OAAO;QACH,IAAI,EAAE,yCAAmB,CAAC,mBAAmB;QAC7C,OAAO,EAAE,0CAA0C,CAAC,YAAY,EAAE,kBAAkB,CAAC;QACrF,KAAK,EAAE,iBAAa,CAAC,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC;QACrE,kBAAkB;QAClB,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC;AACN,CAAC;AAED,SAAS,0CAA0C,CAC/C,YAA6C,EAC7C,kBAAsC;;IAEtC,OAAO,2BAAY,CAAC,qCAAqC,CACrD,gCAAiB,CAAC,wBAAwB,CAAC,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM,mCAAI,GAAG,CAAC,aAAa,CAAC,EAC3F,YAAY,CAAC,UAAU,CAC1B,CAAC;AACN,CAAC"}

package/lib/powerquery-language-services/validate/validateFunctionExpression.js CHANGED Viewed

@@ -5,15 +5,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateFunctionExpression = void 0;
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const localization_1 = require("../localization");
 const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
 const __1 = require("..");
+const trace_1 = require("../trace");
 // Check for repeat parameter names for FunctionExpressions.
 function validateFunctionExpression(validationSettings, nodeIdMapCollection) {
     var _a, _b;
-    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateFunctionExpression.name, validationSettings.initialCorrelationId);
+    const trace = validationSettings.traceManager.entry(trace_1.ValidationTraceConstant.Validation, validateFunctionExpression.name, validationSettings.initialCorrelationId);
     const updatedSettings = Object.assign(Object.assign({}, validationSettings), { initialCorrelationId: trace.id });
-    const fnExpressionIds = nodeIdMapCollection.idsByNodeKind.get("FunctionExpression" /* FunctionExpression */);
+    const fnExpressionIds = nodeIdMapCollection.idsByNodeKind.get(language_1.Ast.NodeKind.FunctionExpression);
     if (fnExpressionIds === undefined) {
         trace.exit();
         return [];
@@ -30,7 +32,7 @@ function validateFunctionExpression(validationSettings, nodeIdMapCollection) {
 exports.validateFunctionExpression = validateFunctionExpression;
 function validateNoDuplicateParameter(validationSettings, nodeIdMapCollection, fnExpressionId) {
     var _a, _b;
-    const fnExpression = parser_1.NodeIdMapUtils.assertGetXorChecked(nodeIdMapCollection, fnExpressionId, "FunctionExpression" /* FunctionExpression */);
+    const fnExpression = parser_1.NodeIdMapUtils.assertXorChecked(nodeIdMapCollection, fnExpressionId, language_1.Ast.NodeKind.FunctionExpression);
     const parameterNames = new Map();
     for (const parameter of parser_1.NodeIdMapIterator.iterFunctionExpressionParameterNames(nodeIdMapCollection, fnExpression)) {
         (_a = validationSettings.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
@@ -42,7 +44,7 @@ function validateNoDuplicateParameter(validationSettings, nodeIdMapCollection, f
     for (const [identifierLiteral, nodes] of parameterNames) {
         if (nodes.length > 1) {
             diagnostics.push(...nodes.map((identifier) => {
-                const parameterRange = __1.PositionUtils.createRangeFromTokenRange(identifier.tokenRange);
+                const parameterRange = __1.PositionUtils.rangeFromTokenRange(identifier.tokenRange);
                 return createDiagnosticForDuplicateParameterName(validationSettings, parameterRange, identifierLiteral);
             }));
         }

package/lib/powerquery-language-services/validate/validateFunctionExpression.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validateFunctionExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateFunctionExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,6EAA6E;AAC7E,sFAKmE;~~AAKnE~~,kDAAkE;AAClE,gEAA6D;AAE7D,0BAAmC;~~AAInC~~,4DAA4D;AAC5D,SAAgB,0BAA0B,CACtC,kBAAsC,EACtC,mBAAyC;;IAEzC,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,~~gCAEtD~~,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,CAAC,oBAAoB,CAC1C,CAAC;IAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;IAEF,MAAM,eAAe,GAA4B,mBAAmB,CAAC,aAAa,CAAC,GAAG~~,+CAErF~~,CAAC;IAEF,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,EAAE,CAAC;KACb;IAED,MAAM,WAAW,GAAmB,EAAE,CAAC;IAEvC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;QAClC,MAAA,kBAAkB,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAEzD,WAAW,CAAC,IAAI,CAAC,4BAA4B,CAAC,eAAe,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC,CAAC;QAC7F,MAAA,eAAe,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;KACzD;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,WAAW,CAAC,IAAI,EAAE,CAAC;AAC9B,CAAC;AArCD,gEAqCC;AAED,SAAS,4BAA4B,CACjC,kBAAsC,EACtC,mBAAyC,EACzC,cAAsB;;IAEtB,MAAM,YAAY,GAAa,uBAAc,CAAC,~~mBAAmB~~,~~CAC7D~~,mBAAmB,EACnB,cAAc,~~gDAEjB~~,CAAC;IAEF,MAAM,cAAc,GAAkC,IAAI,GAAG,EAAE,CAAC;IAEhE,KAAK,MAAM,SAAS,IAAI,0BAAiB,CAAC,oCAAoC,CAAC,mBAAmB,EAAE,YAAY,CAAC,EAAE;QAC/G,MAAA,kBAAkB,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAEzD,MAAM,aAAa,GAAqB,MAAA,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,mCAAI,EAAE,CAAC;QACpF,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;KACxD;IAED,MAAM,WAAW,GAAiB,EAAE,CAAC;IAErC,KAAK,MAAM,CAAC,iBAAiB,EAAE,KAAK,CAAC,IAAI,cAAc,EAAE;QACrD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,WAAW,CAAC,IAAI,CACZ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,UAA0B,EAAE,EAAE;gBACxC,MAAM,cAAc,GAAU,iBAAa,CAAC,~~yBAAyB~~,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;~~gBAE7F~~,OAAO,yCAAyC,CAC5C,kBAAkB,EAClB,cAAc,EACd,iBAAiB,CACpB,CAAC;YACN,CAAC,CAAC,CACL,CAAC;SACL;KACJ;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,SAAS,yCAAyC,CAC9C,kBAAsC,EACtC,qBAA4B,EAC5B,aAAqB;IAErB,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEhH,OAAO;QACH,IAAI,EAAE,yCAAmB,CAAC,mBAAmB;QAC7C,OAAO,EAAE,2BAAY,CAAC,qCAAqC,CAAC,SAAS,EAAE,aAAa,CAAC;QACrF,KAAK,EAAE,qBAAqB;QAC5B,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC;AACN,CAAC"}
1	+ {"version":3,"file":"validateFunctionExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateFunctionExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,6EAA6E;AAC7E,sFAKmE;AACnE,0FAAkF;AAIlF,kDAAkE;AAClE,gEAA6D;AAE7D,0BAAmC;AAEnC,oCAAmD;AAEnD,4DAA4D;AAC5D,SAAgB,0BAA0B,CACtC,kBAAsC,EACtC,mBAAyC;;IAEzC,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,UAAU,EAClC,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,CAAC,oBAAoB,CAC1C,CAAC;IAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;IAEF,MAAM,eAAe,GAA4B,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAClF,cAAG,CAAC,QAAQ,CAAC,kBAAkB,CAClC,CAAC;IAEF,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,EAAE,CAAC;KACb;IAED,MAAM,WAAW,GAAmB,EAAE,CAAC;IAEvC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;QAClC,MAAA,kBAAkB,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAEzD,WAAW,CAAC,IAAI,CAAC,4BAA4B,CAAC,eAAe,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC,CAAC;QAC7F,MAAA,eAAe,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;KACzD;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,WAAW,CAAC,IAAI,EAAE,CAAC;AAC9B,CAAC;AArCD,gEAqCC;AAED,SAAS,4BAA4B,CACjC,kBAAsC,EACtC,mBAAyC,EACzC,cAAsB;;IAEtB,MAAM,YAAY,GAAa,uBAAc,CAAC,gBAAgB,CAC1D,mBAAmB,EACnB,cAAc,EACd,cAAG,CAAC,QAAQ,CAAC,kBAAkB,CAClC,CAAC;IAEF,MAAM,cAAc,GAAkC,IAAI,GAAG,EAAE,CAAC;IAEhE,KAAK,MAAM,SAAS,IAAI,0BAAiB,CAAC,oCAAoC,CAAC,mBAAmB,EAAE,YAAY,CAAC,EAAE;QAC/G,MAAA,kBAAkB,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAEzD,MAAM,aAAa,GAAqB,MAAA,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,mCAAI,EAAE,CAAC;QACpF,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;KACxD;IAED,MAAM,WAAW,GAAiB,EAAE,CAAC;IAErC,KAAK,MAAM,CAAC,iBAAiB,EAAE,KAAK,CAAC,IAAI,cAAc,EAAE;QACrD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,WAAW,CAAC,IAAI,CACZ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,UAA0B,EAAE,EAAE;gBACxC,MAAM,cAAc,GAAU,iBAAa,CAAC,mBAAmB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBAEvF,OAAO,yCAAyC,CAC5C,kBAAkB,EAClB,cAAc,EACd,iBAAiB,CACpB,CAAC;YACN,CAAC,CAAC,CACL,CAAC;SACL;KACJ;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,SAAS,yCAAyC,CAC9C,kBAAsC,EACtC,qBAA4B,EAC5B,aAAqB;IAErB,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEhH,OAAO;QACH,IAAI,EAAE,yCAAmB,CAAC,mBAAmB;QAC7C,OAAO,EAAE,2BAAY,CAAC,qCAAqC,CAAC,SAAS,EAAE,aAAa,CAAC;QACrF,KAAK,EAAE,qBAAqB;QAC5B,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC;AACN,CAAC"}

package/lib/powerquery-language-services/validate/validateInvokeExpression.js CHANGED Viewed

@@ -16,15 +16,17 @@ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
 const __1 = require("..");
 const localization_1 = require("../localization");
 const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
+const trace_2 = require("../trace");
 function validateInvokeExpression(validationSettings, nodeIdMapCollection, typeCache) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateInvokeExpression.name, validationSettings.initialCorrelationId);
+        const trace = validationSettings.traceManager.entry(trace_2.ValidationTraceConstant.Validation, validateInvokeExpression.name, validationSettings.initialCorrelationId);
         const updatedSettings = Object.assign(Object.assign({}, validationSettings), { initialCorrelationId: trace.id });
-        const invokeExpressionIds = nodeIdMapCollection.idsByNodeKind.get("InvokeExpression" /* InvokeExpression */);
+        const invokeExpressionIds = nodeIdMapCollection.idsByNodeKind.get(language_1.Ast.NodeKind.InvokeExpression);
         if (invokeExpressionIds === undefined) {
             trace.exit();
             return [];
@@ -42,7 +44,7 @@ function validateInvokeExpression(validationSettings, nodeIdMapCollection, typeC
                 diagnosticTasks.push(invokeExpressionToDiagnostics(updatedSettings, nodeIdMapCollection, triedInvokeExpression.value));
             }
             else {
-                trace.exit({ ["IsThrowing" /* IsThrowing */]: true });
+                trace.exit({ [trace_1.TraceConstant.IsThrowing]: true });
                 throw triedInvokeExpression;
             }
         }
@@ -59,12 +61,12 @@ function invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection,
         if (inspected.arguments !== undefined) {
             const invokeExpressionArguments = inspected.arguments;
             const givenArguments = inspected.arguments.givenArguments;
-            const invokeExpressionRange = powerquery_parser_1.Assert.asDefined(yield __1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, inspected.invokeExpressionXorNode), "expected at least one leaf node under InvokeExpression");
+            const invokeExpressionRange = powerquery_parser_1.Assert.asDefined(yield __1.PositionUtils.rangeFromXorNode(nodeIdMapCollection, inspected.invokeExpressionXorNode), "expected at least one leaf node under InvokeExpression");
             const functionName = parser_1.NodeIdMapUtils.invokeExpressionIdentifierLiteral(nodeIdMapCollection, inspected.invokeExpressionXorNode.node.id);
             for (const [argIndex, mismatch] of invokeExpressionArguments.typeChecked.invalid.entries()) {
                 (_a = validationSettings.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
                 // eslint-disable-next-line no-await-in-loop
-                const givenArgRange = yield __1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, givenArguments[argIndex]);
+                const givenArgRange = yield __1.PositionUtils.rangeFromXorNode(nodeIdMapCollection, givenArguments[argIndex]);
                 result.push(createDiagnosticForArgumentMismatch(validationSettings, mismatch, functionName, invokeExpressionRange, givenArgRange));
             }
             const numGivenArguments = invokeExpressionArguments.givenArguments.length;

package/lib/powerquery-language-services/validate/validateInvokeExpression.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validateInvokeExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateInvokeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oEAAmE;AACnE,0FAAmG;AACnG,6EAA6E;AAC7E,sFAAgH;~~AAIhH~~,0BAA+C;AAC/C,kDAAkE;AAClE,gEAA6D;~~AAK7D~~,SAAsB,wBAAwB,CAC1C,kBAAsC,EACtC,mBAAyC,EACzC,SAA+B;;;QAE/B,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,~~gCAEtD~~,wBAAwB,CAAC,IAAI,EAC7B,kBAAkB,CAAC,oBAAoB,CAC1C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;QAEF,MAAM,mBAAmB,GAA4B,mBAAmB,CAAC,aAAa,CAAC,GAAG,~~2CAEzF~~,CAAC;QAEF,IAAI,mBAAmB,KAAK,SAAS,EAAE;YACnC,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,EAAE,CAAC;SACb;QAED,MAAM,eAAe,GAAgD,EAAE,CAAC;QAExE,KAAK,MAAM,MAAM,IAAI,mBAAmB,EAAE;YACtC,MAAA,kBAAkB,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;YAEzD,eAAe,CAAC,IAAI,CAAC,cAAU,CAAC,mBAAmB,CAAC,eAAe,EAAE,mBAAmB,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;SACjH;QAED,MAAM,WAAW,GAAoD,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAExG,MAAM,eAAe,GAAyC,EAAE,CAAC;QAEjE,KAAK,MAAM,qBAAqB,IAAI,WAAW,EAAE;YAC7C,MAAA,kBAAkB,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;YAEzD,IAAI,+BAAW,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE;gBACzC,eAAe,CAAC,IAAI,CAChB,6BAA6B,CAAC,eAAe,EAAE,mBAAmB,EAAE,qBAAqB,CAAC,KAAK,CAAC,CACnG,CAAC;aACL;iBAAM;gBACH,KAAK,CAAC,IAAI,CAAC,EAAE~~,+BAA0B~~,EAAE,IAAI,EAAE,CAAC,CAAC;gBAEjD,MAAM,qBAAqB,CAAC;aAC/B;SACJ;QAED,MAAM,WAAW,GAA6C,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACjG,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,WAAW,CAAC,IAAI,EAAE,CAAC;;CAC7B;AAxDD,4DAwDC;AAED,SAAe,6BAA6B,CACxC,kBAAsC,EACtC,mBAAyC,EACzC,SAAsC;;;QAEtC,MAAM,MAAM,GAAiB,EAAE,CAAC;QAEhC,IAAI,SAAS,CAAC,SAAS,KAAK,SAAS,EAAE;YACnC,MAAM,yBAAyB,GAAyC,SAAS,CAAC,SAAS,CAAC;YAC5F,MAAM,cAAc,GAA4B,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC;YAEnF,MAAM,qBAAqB,GAAU,0BAAM,CAAC,SAAS,CACjD,MAAM,iBAAa,CAAC,~~sBAAsB~~,CAAC,mBAAmB,EAAE,SAAS,CAAC,uBAAuB,CAAC,~~EAClG~~,wDAAwD,CAC3D,CAAC;YAEF,MAAM,YAAY,GAAuB,uBAAc,CAAC,iCAAiC,CACrF,mBAAmB,EACnB,SAAS,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAC5C,CAAC;YAEF,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,yBAAyB,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;gBACxF,MAAA,kBAAkB,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;gBAEzD,4CAA4C;gBAC5C,MAAM,aAAa,GAAsB,MAAM,iBAAa,CAAC,~~sBAAsB~~,~~CAC/E~~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"}
1	+ {"version":3,"file":"validateInvokeExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateInvokeExpression.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js CHANGED Viewed

@@ -15,13 +15,16 @@ exports.validateUnknownIdentifiers = void 0;
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const __1 = require("..");
 const localization_1 = require("../localization");
 const jaroWinkler_1 = require("../jaroWinkler");
 const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
+const externalType_1 = require("../externalType/externalType");
+const trace_1 = require("../trace");
 function validateUnknownIdentifiers(validationSettings, nodeIdMapCollection, typeCache) {
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateUnknownIdentifiers.name, validationSettings.initialCorrelationId);
+        const trace = validationSettings.traceManager.entry(trace_1.ValidationTraceConstant.Validation, validateUnknownIdentifiers.name, validationSettings.initialCorrelationId);
         const updatedSettings = Object.assign(Object.assign({}, validationSettings), { initialCorrelationId: trace.id });
         // Grab all identifiers in the given context.
         const identifierValues = findIdentifierAsts(nodeIdMapCollection);
@@ -29,7 +32,7 @@ function validateUnknownIdentifiers(validationSettings, nodeIdMapCollection, typ
         const identifiersWithNodeScope = yield powerquery_parser_1.ArrayUtils.mapAsync(identifierValues, (identifier) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             (_a = validationSettings.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-            const identifierExpression = parser_1.NodeIdMapUtils.parentAstChecked(nodeIdMapCollection, identifier.id, "IdentifierExpression" /* IdentifierExpression */);
+            const identifierExpression = parser_1.NodeIdMapUtils.parentAstChecked(nodeIdMapCollection, identifier.id, language_1.Ast.NodeKind.IdentifierExpression);
             const literal = identifierExpression && identifierExpression.inclusiveConstant !== undefined
                 ? `@${identifier.literal}`
                 : identifier.literal;
@@ -49,7 +52,7 @@ exports.validateUnknownIdentifiers = validateUnknownIdentifiers;
 // For context, "Tbl.AsdC" has a score of ~0.59 against "Table.AddColumn"
 const JaroWinklerSuggestionThreshold = 0.9;
 function findIdentifierAsts(nodeIdMapCollection) {
-    const identifiers = nodeIdMapCollection.idsByNodeKind.get("Identifier" /* Identifier */);
+    const identifiers = nodeIdMapCollection.idsByNodeKind.get(language_1.Ast.NodeKind.Identifier);
     if (identifiers === undefined) {
         return [];
     }
@@ -57,14 +60,14 @@ function findIdentifierAsts(nodeIdMapCollection) {
     const result = [];
     for (const identifierId of identifiers.values()) {
         const identifier = astNodeById.get(identifierId);
-        if (identifier !== undefined && identifier.identifierContextKind === "Value" /* Value */) {
+        if (identifier !== undefined && identifier.identifierContextKind === language_1.Ast.IdentifierContextKind.Value) {
             result.push(identifier);
         }
     }
     return result;
 }
 function findUnknownIdentifiers(validationSettings, identifiersWithNodeScope, correlationId) {
-    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, findUnknownIdentifiers.name, correlationId);
+    const trace = validationSettings.traceManager.entry(trace_1.ValidationTraceConstant.Validation, findUnknownIdentifiers.name, correlationId);
     const unknownIdentifiers = [];
     for (const identifierWithNodeScope of identifiersWithNodeScope) {
         if (powerquery_parser_1.ResultUtils.isError(identifierWithNodeScope.triedNodeScope)) {
@@ -78,7 +81,7 @@ function findUnknownIdentifiers(validationSettings, identifiersWithNodeScope, co
             !validationSettings.library.libraryDefinitions.has(literal) &&
             // even no external type found
             !validationSettings.library.externalTypeResolver({
-                kind: "Value" /* Value */,
+                kind: externalType_1.ExternalTypeRequestKind.Value,
                 identifierLiteral: literal,
             })) {
             const knownIdentifiers = [
@@ -101,7 +104,7 @@ function unknownIdentifiersToDiagnostics(validationSettings, unknownIdentifiers)
     return unknownIdentifiers.map((unknownIdentifier) => ({
         code: diagnosticErrorCode_1.DiagnosticErrorCode.UnknownIdentifier,
         message: localization_1.Localization.error_validation_unknownIdentifier(templates, unknownIdentifier.literal, unknownIdentifier.suggestion),
-        range: __1.PositionUtils.createRangeFromTokenRange(unknownIdentifier.identifier.tokenRange),
+        range: __1.PositionUtils.rangeFromTokenRange(unknownIdentifier.identifier.tokenRange),
         severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
         source: validationSettings.source,
     }));

package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validateUnknownIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateUnknownIdentifiers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oEAAuE;AACvE,6EAA6E;AAC7E,sFAAsG;~~AAItG~~,0BAA+C;AAC/C,kDAAkE;AAClE,gDAAuD;AACvD,gEAA6D;~~AAO7D~~,SAAsB,0BAA0B,CAC5C,kBAAsC,EACtC,mBAAyC,EACzC,SAA+B;;QAE/B,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,~~gCAEtD~~,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,CAAC,oBAAoB,CAC1C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;QAEF,6CAA6C;QAC7C,MAAM,gBAAgB,GAAkC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;QAEhG,uEAAuE;QACvE,MAAM,wBAAwB,GAA2C,MAAM,8BAAU,CAAC,QAAQ,CAGhG,gBAAgB,EAAE,CAAO,UAA0B,EAAE,EAAE;;YACrD,MAAA,kBAAkB,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;YAEzD,MAAM,oBAAoB,GACtB,uBAAc,CAAC,gBAAgB,CAC3B,mBAAmB,EACnB,UAAU,CAAC,EAAE,~~oDAEhB~~,CAAC;YAEN,MAAM,OAAO,GACT,oBAAoB,IAAI,oBAAoB,CAAC,iBAAiB,KAAK,SAAS;gBACxE,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE;gBAC1B,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;YAE7B,OAAO;gBACH,UAAU,EAAE,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,GAAI,UAAU;gBAC9C,OAAO;gBACP,cAAc,EAAE,MAAM,cAAU,CAAC,YAAY,CACzC,eAAe,EACf,mBAAmB,EACnB,UAAU,CAAC,EAAE,EACb,SAAS,CAAC,SAAS,CACtB;aACJ,CAAC;QACN,CAAC,CAAA,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAqC,sBAAsB,CAC/E,kBAAkB,EAClB,wBAAwB,EACxB,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,MAAM,MAAM,GAAiB,+BAA+B,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;QAClG,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AA5DD,gEA4DC;AAED,yEAAyE;AACzE,MAAM,8BAA8B,GAAW,GAAG,CAAC;AAcnD,SAAS,kBAAkB,CAAC,mBAAyC;IACjE,MAAM,WAAW,GAA4B,mBAAmB,CAAC,aAAa,CAAC,GAAG~~,+BAAyB~~,CAAC;IAE5G,IAAI,WAAW,KAAK,SAAS,EAAE;QAC3B,OAAO,EAAE,CAAC;KACb;IAED,MAAM,WAAW,GAA0B,mBAAmB,CAAC,WAAW,CAAC;IAC3E,MAAM,MAAM,GAAqB,EAAE,CAAC;IAEpC,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,UAAU,GAA+B,WAAW,CAAC,GAAG,CAAC,YAAY,CAAmB,CAAC;QAE/F,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,CAAC,qBAAqB,~~wBAAoC~~,EAAE;YAClG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC3B;KACJ;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,sBAAsB,CAC3B,kBAAsC,EACtC,wBAAgE,EAChE,aAAqB;IAErB,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,~~gCAEtD~~,sBAAsB,CAAC,IAAI,EAC3B,aAAa,CAChB,CAAC;IAEF,MAAM,kBAAkB,GAAwB,EAAE,CAAC;IAEnD,KAAK,MAAM,uBAAuB,IAAI,wBAAwB,EAAE;QAC5D,IAAI,+BAAW,CAAC,OAAO,CAAC,uBAAuB,CAAC,cAAc,CAAC,EAAE;YAC7D,SAAS;SACZ;QAED,MAAM,UAAU,GAA8C,uBAAuB,CAAC,UAAU,CAAC;QACjG,MAAM,SAAS,GAAyB,uBAAuB,CAAC,cAAc,CAAC,KAAK,CAAC;QACrF,MAAM,OAAO,GAAW,uBAAuB,CAAC,OAAO,CAAC;QAExD,IACI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC;YACvB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,CAAC,kBAAkB,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC;YAC3D,8BAA8B;YAC9B,CAAC,kBAAkB,CAAC,OAAO,CAAC,oBAAoB,CAAC;gBAC7C,IAAI,~~qBAA+B~~;gBACnC,iBAAiB,EAAE,OAAO;aAC7B,CAAC,EACJ;YACE,MAAM,gBAAgB,GAA0B;gBAC5C,GAAG,SAAS,CAAC,IAAI,EAAE;gBACnB,GAAG,kBAAkB,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE;aAC1D,CAAC;YAEF,MAAM,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAAqB,IAAA,mCAAqB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAE1G,kBAAkB,CAAC,IAAI,CAAC;gBACpB,UAAU;gBACV,OAAO;gBACP,UAAU,EAAE,gBAAgB,GAAG,8BAA8B,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;aACzF,CAAC,CAAC;SACN;KACJ;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,kBAAkB,CAAC;AAC9B,CAAC;AAED,SAAS,+BAA+B,CACpC,kBAAsC,EACtC,kBAAoD;IAEpD,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEhH,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC,iBAAoC,EAAE,EAAE,CAAC,CAAC;QACrE,IAAI,EAAE,yCAAmB,CAAC,iBAAiB;QAC3C,OAAO,EAAE,2BAAY,CAAC,kCAAkC,CACpD,SAAS,EACT,iBAAiB,CAAC,OAAO,EACzB,iBAAiB,CAAC,UAAU,CAC/B;QACD,KAAK,EAAE,iBAAa,CAAC,~~yBAAyB~~,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC;~~QACvF~~,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC,CAAC,CAAC;AACR,CAAC"}
1	+ {"version":3,"file":"validateUnknownIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateUnknownIdentifiers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oEAAuE;AACvE,6EAA6E;AAC7E,sFAAsG;AACtG,0FAAkF;AAGlF,0BAA+C;AAC/C,kDAAkE;AAClE,gDAAuD;AACvD,gEAA6D;AAC7D,+DAAuE;AAIvE,oCAAmD;AAEnD,SAAsB,0BAA0B,CAC5C,kBAAsC,EACtC,mBAAyC,EACzC,SAA+B;;QAE/B,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,UAAU,EAClC,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,CAAC,oBAAoB,CAC1C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;QAEF,6CAA6C;QAC7C,MAAM,gBAAgB,GAAkC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;QAEhG,uEAAuE;QACvE,MAAM,wBAAwB,GAA2C,MAAM,8BAAU,CAAC,QAAQ,CAGhG,gBAAgB,EAAE,CAAO,UAA0B,EAAE,EAAE;;YACrD,MAAA,kBAAkB,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;YAEzD,MAAM,oBAAoB,GACtB,uBAAc,CAAC,gBAAgB,CAC3B,mBAAmB,EACnB,UAAU,CAAC,EAAE,EACb,cAAG,CAAC,QAAQ,CAAC,oBAAoB,CACpC,CAAC;YAEN,MAAM,OAAO,GACT,oBAAoB,IAAI,oBAAoB,CAAC,iBAAiB,KAAK,SAAS;gBACxE,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE;gBAC1B,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;YAE7B,OAAO;gBACH,UAAU,EAAE,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,GAAI,UAAU;gBAC9C,OAAO;gBACP,cAAc,EAAE,MAAM,cAAU,CAAC,YAAY,CACzC,eAAe,EACf,mBAAmB,EACnB,UAAU,CAAC,EAAE,EACb,SAAS,CAAC,SAAS,CACtB;aACJ,CAAC;QACN,CAAC,CAAA,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAqC,sBAAsB,CAC/E,kBAAkB,EAClB,wBAAwB,EACxB,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,MAAM,MAAM,GAAiB,+BAA+B,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;QAClG,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AA5DD,gEA4DC;AAED,yEAAyE;AACzE,MAAM,8BAA8B,GAAW,GAAG,CAAC;AAcnD,SAAS,kBAAkB,CAAC,mBAAyC;IACjE,MAAM,WAAW,GAA4B,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAAC,cAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE5G,IAAI,WAAW,KAAK,SAAS,EAAE;QAC3B,OAAO,EAAE,CAAC;KACb;IAED,MAAM,WAAW,GAA0B,mBAAmB,CAAC,WAAW,CAAC;IAC3E,MAAM,MAAM,GAAqB,EAAE,CAAC;IAEpC,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,UAAU,GAA+B,WAAW,CAAC,GAAG,CAAC,YAAY,CAAmB,CAAC;QAE/F,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,CAAC,qBAAqB,KAAK,cAAG,CAAC,qBAAqB,CAAC,KAAK,EAAE;YAClG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC3B;KACJ;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,sBAAsB,CAC3B,kBAAsC,EACtC,wBAAgE,EAChE,aAAqB;IAErB,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,UAAU,EAClC,sBAAsB,CAAC,IAAI,EAC3B,aAAa,CAChB,CAAC;IAEF,MAAM,kBAAkB,GAAwB,EAAE,CAAC;IAEnD,KAAK,MAAM,uBAAuB,IAAI,wBAAwB,EAAE;QAC5D,IAAI,+BAAW,CAAC,OAAO,CAAC,uBAAuB,CAAC,cAAc,CAAC,EAAE;YAC7D,SAAS;SACZ;QAED,MAAM,UAAU,GAA8C,uBAAuB,CAAC,UAAU,CAAC;QACjG,MAAM,SAAS,GAAyB,uBAAuB,CAAC,cAAc,CAAC,KAAK,CAAC;QACrF,MAAM,OAAO,GAAW,uBAAuB,CAAC,OAAO,CAAC;QAExD,IACI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC;YACvB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,CAAC,kBAAkB,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC;YAC3D,8BAA8B;YAC9B,CAAC,kBAAkB,CAAC,OAAO,CAAC,oBAAoB,CAAC;gBAC7C,IAAI,EAAE,sCAAuB,CAAC,KAAK;gBACnC,iBAAiB,EAAE,OAAO;aAC7B,CAAC,EACJ;YACE,MAAM,gBAAgB,GAA0B;gBAC5C,GAAG,SAAS,CAAC,IAAI,EAAE;gBACnB,GAAG,kBAAkB,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE;aAC1D,CAAC;YAEF,MAAM,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAAqB,IAAA,mCAAqB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAE1G,kBAAkB,CAAC,IAAI,CAAC;gBACpB,UAAU;gBACV,OAAO;gBACP,UAAU,EAAE,gBAAgB,GAAG,8BAA8B,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;aACzF,CAAC,CAAC;SACN;KACJ;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,kBAAkB,CAAC;AAC9B,CAAC;AAED,SAAS,+BAA+B,CACpC,kBAAsC,EACtC,kBAAoD;IAEpD,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEhH,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC,iBAAoC,EAAE,EAAE,CAAC,CAAC;QACrE,IAAI,EAAE,yCAAmB,CAAC,iBAAiB;QAC3C,OAAO,EAAE,2BAAY,CAAC,kCAAkC,CACpD,SAAS,EACT,iBAAiB,CAAC,OAAO,EACzB,iBAAiB,CAAC,UAAU,CAC/B;QACD,KAAK,EAAE,iBAAa,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC;QACjF,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC,CAAC,CAAC;AACR,CAAC"}

package/package.json CHANGED Viewed

@@ -1,12 +1,14 @@
 {
     "name": "@microsoft/powerquery-language-services",
-    "version": "0.6.12",
+    "version": "0.9.6",
     "author": "Microsoft",
     "license": "MIT",
     "scripts": {
         "prepublishOnly": "git clean -xdf && npm install-clean && npm run lint && npm run build && npm run test",
         "build": ".\\node_modules\\.bin\\tsc",
         "watch": ".\\node_modules\\.bin\\tsc -b -watch",
+        "link:start": "npm link && npm uninstall @microsoft/powerquery-parser @microsoft/powerquery-formatter && git clean -xdf && npm install && npm link @microsoft/powerquery-parser @microsoft/powerquery-formatter",
+        "link:stop": "npm unlink @microsoft/powerquery-parser @microsoft/powerquery-formatter && git clean -xdf && npm install && npm install @microsoft/powerquery-parser@latest @microsoft/powerquery-formatter@latest --save-exact",
         "lint": "eslint src --ext ts",
         "test": "mocha --reporter mocha-multi-reporters --reporter-options configFile=src/test/mochaConfig.json -r ts-node/register src/test/**/*.ts"
     },
@@ -28,6 +30,9 @@
         "power query",
         "power bi"
     ],
+    "files": [
+        "lib/powerquery-language-services/**/*"
+    ],
     "devDependencies": {
         "@types/chai": "4.3.1",
         "@types/mocha": "9.1.1",
@@ -49,12 +54,9 @@
         "typescript": "4.6.4"
     },
     "dependencies": {
-        "@microsoft/powerquery-formatter": "0.3.6",
-        "@microsoft/powerquery-parser": "0.11.2",
+        "@microsoft/powerquery-formatter": "0.3.13",
+        "@microsoft/powerquery-parser": "0.15.9",
         "vscode-languageserver-textdocument": "1.0.4",
         "vscode-languageserver-types": "3.17.1"
-    },
-    "files": [
-        "lib/powerquery-language-services/**/*"
-    ]
-}
+    }
+}

package/lib/powerquery-language-services/inspection/autocomplete/common.js DELETED Viewed

@@ -1,11 +0,0 @@
-"use strict";
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTrailingToken = void 0;
-const __1 = require("../..");
-function createTrailingToken(position, parseErrorToken) {
-    return Object.assign(Object.assign({}, parseErrorToken), { isInOrOnPosition: __1.PositionUtils.isInToken(position, parseErrorToken, false, true) });
-}
-exports.createTrailingToken = createTrailingToken;
-//# sourceMappingURL=common.js.map