@microsoft/powerquery-language-services 0.3.21 → 0.3.24

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeRecordType = void 0;
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const __1 = require("../../..");
 const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
 function inspectTypeRecordType(state, xorNode, maybeCorrelationId) {
@@ -22,13 +23,23 @@ function inspectTypeRecordType(state, xorNode, maybeCorrelationId) {
         const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecordType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
         (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RecordType" /* RecordType */);
-        const maybeFields = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "FieldSpecificationList" /* FieldSpecificationList */);
         let result;
-        if (maybeFields === undefined) {
-            result = language_1.Type.UnknownInstance;
-        }
-        else {
-            result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeFields, trace.id)));
+        switch (state.typeStrategy) {
+            case "Extended" /* Extended */: {
+                const maybeFields = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "FieldSpecificationList" /* FieldSpecificationList */);
+                if (maybeFields === undefined) {
+                    result = language_1.Type.UnknownInstance;
+                }
+                else {
+                    result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeFields, trace.id)));
+                }
+                break;
+            }
+            case "Primitive" /* Primitive */:
+                result = language_1.Type.TypePrimitiveInstance;
+                break;
+            default:
+                powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,mFAAgF;AAGhF,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,MAAM,WAAW,GAAyB,uBAAc,CAAC,oBAAoB,CACzE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,wDAEJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,WAAW,KAAK,SAAS,EAAE;YAC3B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,mBACF,IAAI,qBACJ,iBAAiB,iCACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAtCD,sDAsCC"}
+{"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,mFAAgF;AAIhF,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,IAAI,MAAkD,CAAC;QAEvD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,WAAW,GAAyB,uBAAc,CAAC,oBAAoB,CACzE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,wDAEJ,CAAC;gBAEF,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC3B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,mBACF,IAAI,qBACJ,iBAAiB,iCACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;iBACL;gBAED,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnDD,sDAmDC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.d.ts

@@ -1,4 +1,4 @@
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeTableType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TableType | Type.TableTypePrimaryExpression | Type.Unknown>;
+export declare function inspectTypeTableType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.Type | Type.TableType | Type.TableTypePrimaryExpression | Type.Unknown>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeTableType = void 0;
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const __1 = require("../../..");
 const common_1 = require("./common");
 const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
@@ -23,21 +24,31 @@ function inspectTypeTableType(state, xorNode, maybeCorrelationId) {
         const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeTableType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
         (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "TableType" /* TableType */);
-        const maybeRowType = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
         let result;
-        if (maybeRowType === undefined) {
-            result = language_1.Type.UnknownInstance;
-        }
-        else if (maybeRowType.node.kind === "FieldSpecificationList" /* FieldSpecificationList */) {
-            result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "TableType" /* TableType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeRowType, trace.id)));
-        }
-        else {
-            result = {
-                kind: "Type" /* Type */,
-                maybeExtendedKind: "TableTypePrimaryExpression" /* TableTypePrimaryExpression */,
-                isNullable: false,
-                primaryExpression: yield (0, common_1.inspectXor)(state, maybeRowType, trace.id),
-            };
+        switch (state.typeStrategy) {
+            case "Extended" /* Extended */: {
+                const maybeRowType = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
+                if (maybeRowType === undefined) {
+                    result = language_1.Type.UnknownInstance;
+                }
+                else if (maybeRowType.node.kind === "FieldSpecificationList" /* FieldSpecificationList */) {
+                    result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "TableType" /* TableType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeRowType, trace.id)));
+                }
+                else {
+                    result = {
+                        kind: "Type" /* Type */,
+                        maybeExtendedKind: "TableTypePrimaryExpression" /* TableTypePrimaryExpression */,
+                        isNullable: false,
+                        primaryExpression: yield (0, common_1.inspectXor)(state, maybeRowType, trace.id),
+                    };
+                }
+                break;
+            }
+            case "Primitive" /* Primitive */:
+                result = language_1.Type.TypePrimitiveInstance;
+                break;
+            default:
+                powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeTableType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAwD;AACxD,mFAAgF;AAEhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAgB,OAAO,8BAAyB,CAAC;QAE9E,MAAM,YAAY,GAAyB,uBAAc,CAAC,aAAa,CACnE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,0DAAwC,EAAE;YACvE,MAAM,mBACF,IAAI,qBACJ,iBAAiB,+BACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAC1E,CAAC;SACL;aAAM;YACH,MAAM,GAAG;gBACL,IAAI,mBAAoB;gBACxB,iBAAiB,+DAAkD;gBACnE,UAAU,EAAE,KAAK;gBACjB,iBAAiB,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;aACrE,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA5CD,oDA4CC"}
+{"version":3,"file":"inspectTypeTableType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,qCAAwD;AACxD,mFAAgF;AAGhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAgB,OAAO,8BAAyB,CAAC;QAE9E,IAAI,MAAmF,CAAC;QAExF,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,YAAY,GAAyB,uBAAc,CAAC,aAAa,CACnE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;gBAEF,IAAI,YAAY,KAAK,SAAS,EAAE;oBAC5B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,0DAAwC,EAAE;oBACvE,MAAM,mBACF,IAAI,qBACJ,iBAAiB,+BACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAC1E,CAAC;iBACL;qBAAM;oBACH,MAAM,GAAG;wBACL,IAAI,mBAAoB;wBACxB,iBAAiB,+DAAkD;wBACnE,UAAU,EAAE,KAAK;wBACjB,iBAAiB,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;qBACrE,CAAC;iBACL;gBAED,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAzDD,oDAyDC"}

package/lib/powerquery-language-services/inspection/type/task.js

@@ -23,41 +23,20 @@ function tryScopeType(settings, nodeIdMapCollection, nodeId,
 typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
     return __awaiter(this, void 0, void 0, function* () {
         const trace = settings.traceManager.entry("Inspection.ScopeType" /* InspectScopeType */, tryScopeType.name, settings.maybeInitialCorrelationId);
-        const state = {
-            library: settings.library,
-            locale: settings.locale,
-            isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
-            maybeCancellationToken: settings.maybeCancellationToken,
-            maybeEachScopeById: settings.maybeEachScopeById,
-            maybeInitialCorrelationId: trace.id,
-            traceManager: settings.traceManager,
-            givenTypeById: typeCache.typeById,
-            deltaTypeById: new Map(),
-            nodeIdMapCollection,
-            scopeById: typeCache.scopeById,
-        };
+        const state = createState(settings, nodeIdMapCollection, typeCache, trace.id);
         const result = powerquery_parser_1.ResultUtils.ensureResultAsync(() => inspectScopeType(state, nodeId, trace.id), settings.locale);
         trace.exit();
         return result;
     });
 }
 exports.tryScopeType = tryScopeType;
-function tryType(settings, nodeIdMapCollection, nodeId, typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
+function tryType(settings, nodeIdMapCollection, nodeId, 
+// If a TypeCache is given, then potentially add to its values and include it as part of the return,
+// Else create a new TypeCache and include it in the return.
+typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
     return __awaiter(this, void 0, void 0, function* () {
         const trace = settings.traceManager.entry("Inspection.Type" /* InspectType */, tryType.name, settings.maybeInitialCorrelationId);
-        const state = {
-            library: settings.library,
-            locale: settings.locale,
-            isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
-            maybeCancellationToken: settings.maybeCancellationToken,
-            maybeEachScopeById: settings.maybeEachScopeById,
-            maybeInitialCorrelationId: trace.id,
-            traceManager: settings.traceManager,
-            givenTypeById: typeCache.typeById,
-            deltaTypeById: new Map(),
-            nodeIdMapCollection,
-            scopeById: typeCache.scopeById,
-        };
+        const state = createState(settings, nodeIdMapCollection, typeCache, trace.id);
         const result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => (0, inspectType_1.inspectXor)(state, parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId), trace.id), settings.locale);
         trace.exit({ ["IsError" /* IsError */]: result.kind });
         return result;
@@ -86,4 +65,20 @@ function inspectScopeType(state, nodeId, correlationId) {
         return result;
     });
 }
+function createState(settings, nodeIdMapCollection, typeCache, correlationId) {
+    return {
+        library: settings.library,
+        locale: settings.locale,
+        isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
+        maybeCancellationToken: settings.maybeCancellationToken,
+        maybeEachScopeById: settings.maybeEachScopeById,
+        maybeInitialCorrelationId: correlationId,
+        traceManager: settings.traceManager,
+        typeStrategy: settings.typeStrategy,
+        givenTypeById: typeCache.typeById,
+        deltaTypeById: new Map(),
+        nodeIdMapCollection,
+        scopeById: typeCache.scopeById,
+    };
+}
 //# sourceMappingURL=task.js.map

package/lib/powerquery-language-services/inspection/type/task.js.map

@@ -1 +1 @@
-{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/inspectionSettings.d.ts

@@ -1,8 +1,13 @@
 import * as PQP from "@microsoft/powerquery-parser";
 import { Library } from "./library";
 import { TypeById } from "./inspection";
+export declare const enum TypeStrategy {
+    Extended = "Extended",
+    Primitive = "Primitive"
+}
 export interface InspectionSettings extends PQP.Settings {
     readonly isWorkspaceCacheAllowed: boolean;
     readonly library: Library.ILibrary;
     readonly maybeEachScopeById: TypeById | undefined;
+    readonly typeStrategy: TypeStrategy;
 }

package/lib/powerquery-language-services/inspectionUtils.d.ts

@@ -3,11 +3,9 @@ import { Ast, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/la
 import { DocumentSymbol, SignatureHelp, SymbolKind } from "vscode-languageserver-types";
 import { AutocompleteItemProviderContext, SignatureProviderContext } from "./providers/commonTypes";
 import { Inspection } from ".";
-import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
 import { InspectionSettings } from "./inspectionSettings";
-import { Library } from "./library";
-import { TypeById } from "./inspection";
-export declare function createInspectionSettings(settings: PQP.Settings, maybeEachScopeById: TypeById | undefined, maybeLibrary: Library.ILibrary | undefined, isWorkspaceCacheAllowed: boolean): InspectionSettings;
+import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
+export declare function createInspectionSettings(settings: PQP.Settings, overrides?: Partial<InspectionSettings>): InspectionSettings;
 export declare function getMaybeContextForSignatureProvider(inspected: Inspection.Inspected, traceManager: TraceManager, maybeCorrelationId: number | undefined): Promise<SignatureProviderContext | undefined>;
 export declare function getMaybeSignatureHelp(context: SignatureProviderContext, correlationId: number): SignatureHelp | null;
 export declare function getMaybeType(inspected: Inspection.Inspected, identifier: string): Promise<Type.TPowerQueryType | undefined>;

package/lib/powerquery-language-services/inspectionUtils.js

@@ -18,9 +18,9 @@ const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const _1 = require(".");
 const autocomplete_1 = require("./inspection/autocomplete");
 const library_1 = require("./library");
-function createInspectionSettings(settings, maybeEachScopeById, maybeLibrary, isWorkspaceCacheAllowed) {
-    return Object.assign(Object.assign({}, settings), { library: maybeLibrary !== null && maybeLibrary !== void 0 ? maybeLibrary : library_1.Library.NoOpLibrary, maybeEachScopeById,
-        isWorkspaceCacheAllowed });
+function createInspectionSettings(settings, overrides) {
+    var _a, _b, _c, _d;
+    return Object.assign(Object.assign({}, settings), { isWorkspaceCacheAllowed: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.isWorkspaceCacheAllowed) !== null && _a !== void 0 ? _a : true, library: (_b = overrides === null || overrides === void 0 ? void 0 : overrides.library) !== null && _b !== void 0 ? _b : library_1.Library.NoOpLibrary, typeStrategy: (_c = overrides === null || overrides === void 0 ? void 0 : overrides.typeStrategy) !== null && _c !== void 0 ? _c : "Extended" /* Extended */, maybeEachScopeById: (_d = overrides === null || overrides === void 0 ? void 0 : overrides.maybeEachScopeById) !== null && _d !== void 0 ? _d : undefined });
 }
 exports.createInspectionSettings = createInspectionSettings;
 function getMaybeContextForSignatureProvider(inspected, traceManager, maybeCorrelationId) {

package/lib/powerquery-language-services/inspectionUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":"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"}

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

@@ -47,80 +47,91 @@ function validateDuplicateIdentifiers(textDocument, validationSettings) {
         const documentUri = textDocument.uri;
         const nodeIdMapCollection = maybeNodeIdMapCollection;
         const result = [
-            ...validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, updatedSettings),
-            ...validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, updatedSettings),
-            ...validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, updatedSettings),
+            ...validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
+            ...validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
+            ...validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
         ];
         trace.exit();
         return result;
     });
 }
 exports.validateDuplicateIdentifiers = validateDuplicateIdentifiers;
-function validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings) {
+function validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings, correlationId) {
     var _a;
-    const letIds = [
-        ...((_a = nodeIdMapCollection.idsByNodeKind.get("LetExpression" /* LetExpression */)) !== null && _a !== void 0 ? _a : []),
-    ];
-    return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, letIds, parser_1.NodeIdMapIterator.iterLetExpression, validationSettings);
+    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 result = validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, [letIds], parser_1.NodeIdMapIterator.iterLetExpression, validationSettings, trace.id);
+    trace.exit();
+    return result;
 }
-function validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, validationSettings) {
-    var _a, _b, _c;
+function validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, validationSettings, correlationId) {
+    var _a, _b;
+    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForRecord.name, correlationId);
     const recordIds = [
-        ...((_a = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _a !== void 0 ? _a : []),
-        ...((_b = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _b !== void 0 ? _b : []),
-        ...((_c = nodeIdMapCollection.idsByNodeKind.get("RecordType" /* RecordType */)) !== null && _c !== void 0 ? _c : []),
+        (_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(),
     ];
-    return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, parser_1.NodeIdMapIterator.iterRecord, validationSettings);
+    const result = validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, parser_1.NodeIdMapIterator.iterRecord, validationSettings, trace.id);
+    trace.exit();
+    return result;
 }
-function validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, validationSettings) {
+function validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, validationSettings, correlationId) {
     var _a;
-    const recordIds = [...((_a = nodeIdMapCollection.idsByNodeKind.get("Section" /* Section */)) !== null && _a !== void 0 ? _a : [])];
-    return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, parser_1.NodeIdMapIterator.iterSection, validationSettings);
+    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 result = validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, [sectionIds], parser_1.NodeIdMapIterator.iterSection, validationSettings, trace.id);
+    trace.exit();
+    return result;
 }
 // Generalized logic for iterating over some collection and their children, essentially by doing:
 //  for node in nodeIds:
 //      for childOfNode in iterNodeFn(node):
 //          ...
-function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, nodeIds, iterNodeFn, validationSettings) {
-    if (!nodeIds.length) {
+function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, nodeIdCollections, iterNodeFn, validationSettings, correlationId) {
+    const numIds = nodeIdCollections.reduce((partial, set) => partial + set.size, 0);
+    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForKeyValuePair.name, correlationId, { numIds });
+    if (!numIds) {
         return [];
     }
     const result = [];
-    for (const nodeId of nodeIds) {
-        const node = parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId);
-        const duplicateFieldsByKey = new Map();
-        const knownFieldByKey = new Map();
-        for (const field of iterNodeFn(nodeIdMapCollection, node)) {
-            const keyLiteral = field.normalizedKeyLiteral;
-            const maybeDuplicateFields = duplicateFieldsByKey.get(keyLiteral);
-            const maybeKnownField = knownFieldByKey.get(keyLiteral);
-            if (maybeDuplicateFields) {
-                maybeDuplicateFields.push(field);
+    for (const collection of nodeIdCollections) {
+        for (const nodeId of collection) {
+            const node = parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId);
+            const duplicateFieldsByKey = new Map();
+            const knownFieldByKey = new Map();
+            for (const field of iterNodeFn(nodeIdMapCollection, node)) {
+                const keyLiteral = field.normalizedKeyLiteral;
+                const maybeDuplicateFields = duplicateFieldsByKey.get(keyLiteral);
+                const maybeKnownField = knownFieldByKey.get(keyLiteral);
+                if (maybeDuplicateFields) {
+                    maybeDuplicateFields.push(field);
+                }
+                else if (maybeKnownField) {
+                    duplicateFieldsByKey.set(keyLiteral, [field, maybeKnownField]);
+                }
+                else {
+                    knownFieldByKey.set(keyLiteral, field);
+                }
             }
-            else if (maybeKnownField) {
-                duplicateFieldsByKey.set(keyLiteral, [field, maybeKnownField]);
-            }
-            else {
-                knownFieldByKey.set(keyLiteral, field);
-            }
-        }
-        for (const duplicates of duplicateFieldsByKey.values()) {
-            const numFields = duplicates.length;
-            const asRelatedInformation = duplicates.map((keyValuePair) => ({
-                location: {
-                    uri: documentUri,
-                    range: __1.PositionUtils.createRangeFromTokenRange(keyValuePair.key.tokenRange),
-                },
-                message: createDuplicateIdentifierDiagnosticMessage(keyValuePair, validationSettings),
-            }));
-            for (let index = 0; index < numFields; index += 1) {
-                const duplicate = duplicates[index];
-                // Grab all DiagnosticRelatedInformation for a given key besides the one we're iterating over.
-                const relatedInformation = asRelatedInformation.filter((_, relatedIndex) => index !== relatedIndex);
-                result.push(createDuplicateIdentifierDiagnostic(duplicate, relatedInformation, validationSettings));
+            for (const duplicates of duplicateFieldsByKey.values()) {
+                const numFields = duplicates.length;
+                const asRelatedInformation = duplicates.map((keyValuePair) => ({
+                    location: {
+                        uri: documentUri,
+                        range: __1.PositionUtils.createRangeFromTokenRange(keyValuePair.key.tokenRange),
+                    },
+                    message: createDuplicateIdentifierDiagnosticMessage(keyValuePair, validationSettings),
+                }));
+                for (let index = 0; index < numFields; index += 1) {
+                    const duplicate = duplicates[index];
+                    // Grab all DiagnosticRelatedInformation for a given key besides the one we're iterating over.
+                    const relatedInformation = asRelatedInformation.filter((_, relatedIndex) => index !== relatedIndex);
+                    result.push(createDuplicateIdentifierDiagnostic(duplicate, relatedInformation, validationSettings));
+                }
             }
         }
     }
+    trace.exit();
     return result;
 }
 function createDuplicateIdentifierDiagnostic(keyValuePair, relatedInformation, validationSettings) {

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

@@ -1 +1 @@
-{"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":"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"}

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

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 __1 = require("..");
 const localization_1 = require("../localization");
 const jaroWinkler_1 = require("../jaroWinkler");
@@ -26,13 +27,23 @@ function validateUnknownIdentifiers(validationSettings, nodeIdMapCollection, typ
         const updatedSettings = Object.assign(Object.assign({}, validationSettings), { maybeInitialCorrelationId: trace.id });
         // Grab all identifiers in the value context.
         const identifierValues = findIdentifierValues(nodeIdMapCollection);
-        // Create a zipped collection of [value identifier, TriedNodeScope for the value identifier]
+        // Create a zipped collection of: [
+        //  value identifier,
+        //  value identifier expression | undefined (if it exists),
+        //  TriedNodeScope for the value identifier
+        // ]
         const identifiersAndTriedNodeScopes = yield powerquery_parser_1.ArrayUtils.mapAsync(identifierValues, (identifier) => __awaiter(this, void 0, void 0, function* () {
             return [
                 identifier,
+                parser_1.NodeIdMapUtils.maybeParentAstChecked(nodeIdMapCollection, identifier.id, "IdentifierExpression" /* IdentifierExpression */),
                 yield __1.Inspection.tryNodeScope(updatedSettings, nodeIdMapCollection, identifier.id, typeCache.scopeById),
             ];
         }));
+        // Creates a zipped collection of: [
+        //  unknown identifier | unknown identifier expression,
+        //  unknown identifier literal,
+        //  Jaro Winkler suggestion for the unknown literal if above a certain score threshold,
+        // ]
         const unknownIdentifiers = findUnknownIdentifiers(validationSettings, identifiersAndTriedNodeScopes, trace.id);
         const result = unknownIdentifiersToDiagnostics(updatedSettings, unknownIdentifiers);
         trace.exit();
@@ -61,20 +72,23 @@ function findUnknownIdentifiers(validationSettings, identifiersAndTriedNodeScope
     const unknownIdentifiers = [];
     const numIdentifiers = identifiersAndTriedNodeScopes.length;
     for (let index = 0; index < numIdentifiers; index += 1) {
-        const [identifier, triedNodeScope] = identifiersAndTriedNodeScopes[index];
+        const [identifier, maybeIdentifierExpression, triedNodeScope] = identifiersAndTriedNodeScopes[index];
         if (powerquery_parser_1.ResultUtils.isError(triedNodeScope)) {
             continue;
         }
         const nodeScope = triedNodeScope.value;
-        if (!nodeScope.has(identifier.literal) &&
-            !validationSettings.library.libraryDefinitions.has(identifier.literal)) {
+        const literal = maybeIdentifierExpression && maybeIdentifierExpression.maybeInclusiveConstant !== undefined
+            ? `@${identifier.literal}`
+            : identifier.literal;
+        if (!nodeScope.has(literal) && !validationSettings.library.libraryDefinitions.has(literal)) {
             const knownIdentifiers = [
                 ...nodeScope.keys(),
                 ...validationSettings.library.libraryDefinitions.keys(),
             ];
-            const [jaroWinklerScore, suggestion] = (0, jaroWinkler_1.calculateJaroWinklers)(identifier.literal, knownIdentifiers);
+            const [jaroWinklerScore, suggestion] = (0, jaroWinkler_1.calculateJaroWinklers)(literal, knownIdentifiers);
             unknownIdentifiers.push([
-                identifier,
+                maybeIdentifierExpression !== null && maybeIdentifierExpression !== void 0 ? maybeIdentifierExpression : identifier,
+                literal,
                 jaroWinklerScore > JaroWinklerSuggestionThreshold ? suggestion : undefined,
             ]);
         }
@@ -84,9 +98,9 @@ function findUnknownIdentifiers(validationSettings, identifiersAndTriedNodeScope
 }
 function unknownIdentifiersToDiagnostics(validationSettings, unknownIdentifiers) {
     const templates = localization_1.LocalizationUtils.getLocalizationTemplates(validationSettings.locale);
-    return unknownIdentifiers.map(([identifier, maybeSuggestion]) => ({
+    return unknownIdentifiers.map(([identifier, literal, maybeSuggestion]) => ({
         code: diagnosticErrorCode_1.DiagnosticErrorCode.UnknownIdentifier,
-        message: localization_1.Localization.error_validation_unknownIdentifier(templates, identifier.literal, maybeSuggestion),
+        message: localization_1.Localization.error_validation_unknownIdentifier(templates, literal, maybeSuggestion),
         range: __1.PositionUtils.createRangeFromTokenRange(identifier.tokenRange),
         severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
         source: validationSettings.source,

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

@@ -1 +1 @@
-{"version":3,"file":"validateUnknownIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateUnknownIdentifiers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateUnknownIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateUnknownIdentifiers.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.d.ts

@@ -1,3 +1,3 @@
 import { InspectionSettings } from "../..";
 import { ValidationSettings } from "./validationSettings";
-export declare function createValidationSettings(inspectionSettings: InspectionSettings, source: string, checkForDuplicateIdentifiers?: boolean, checkInvokeExpressions?: boolean, checkUnknownIdentifiers?: boolean): ValidationSettings;
+export declare function createValidationSettings(inspectionSettings: InspectionSettings, source: string, overrides?: Partial<ValidationSettings>): ValidationSettings;

package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js

@@ -3,8 +3,9 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createValidationSettings = void 0;
-function createValidationSettings(inspectionSettings, source, checkForDuplicateIdentifiers, checkInvokeExpressions, checkUnknownIdentifiers) {
-    return Object.assign(Object.assign({}, inspectionSettings), { checkForDuplicateIdentifiers: checkForDuplicateIdentifiers !== null && checkForDuplicateIdentifiers !== void 0 ? checkForDuplicateIdentifiers : true, checkInvokeExpressions: checkInvokeExpressions !== null && checkInvokeExpressions !== void 0 ? checkInvokeExpressions : true, checkUnknownIdentifiers: checkUnknownIdentifiers !== null && checkUnknownIdentifiers !== void 0 ? checkUnknownIdentifiers : true, library: inspectionSettings.library, source });
+function createValidationSettings(inspectionSettings, source, overrides) {
+    var _a, _b, _c;
+    return Object.assign(Object.assign({}, inspectionSettings), { checkForDuplicateIdentifiers: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.checkForDuplicateIdentifiers) !== null && _a !== void 0 ? _a : true, checkInvokeExpressions: (_b = overrides === null || overrides === void 0 ? void 0 : overrides.checkInvokeExpressions) !== null && _b !== void 0 ? _b : true, checkUnknownIdentifiers: (_c = overrides === null || overrides === void 0 ? void 0 : overrides.checkUnknownIdentifiers) !== null && _c !== void 0 ? _c : true, library: inspectionSettings.library, source });
 }
 exports.createValidationSettings = createValidationSettings;
 //# sourceMappingURL=validationSettingsUtils.js.map

package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"validationSettingsUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/validate/validationSettings/validationSettingsUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,SAAgB,wBAAwB,CACpC,kBAAsC,EACtC,MAAc,EACd,4BAAsC,EACtC,sBAAgC,EAChC,uBAAiC;IAEjC,uCACO,kBAAkB,KACrB,4BAA4B,EAAE,4BAA4B,aAA5B,4BAA4B,cAA5B,4BAA4B,GAAI,IAAI,EAClE,sBAAsB,EAAE,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,IAAI,EACtD,uBAAuB,EAAE,uBAAuB,aAAvB,uBAAuB,cAAvB,uBAAuB,GAAI,IAAI,EACxD,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,MAAM,IACR;AACN,CAAC;AAfD,4DAeC"}
+{"version":3,"file":"validationSettingsUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/validate/validationSettings/validationSettingsUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,SAAgB,wBAAwB,CACpC,kBAAsC,EACtC,MAAc,EACd,SAAuC;;IAEvC,uCACO,kBAAkB,KACrB,4BAA4B,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,4BAA4B,mCAAI,IAAI,EAC7E,sBAAsB,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,sBAAsB,mCAAI,IAAI,EACjE,uBAAuB,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,uBAAuB,mCAAI,IAAI,EACnE,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,MAAM,IACR;AACN,CAAC;AAbD,4DAaC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@microsoft/powerquery-language-services",
-    "version": "0.3.21",
+    "version": "0.3.24",
     "author": "Microsoft",
     "license": "MIT",
     "scripts": {