@microsoft/powerquery-language-services 0.11.1 → 0.11.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/powerquery-language-services/inspection/dereferencedIdentifier/dereferencedIdentifierUtils.js +3 -3
- package/lib/powerquery-language-services/inspection/dereferencedIdentifier/dereferencedIdentifierUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scope.d.ts +4 -1
- package/lib/powerquery-language-services/inspection/scope/scope.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js +151 -92
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js +2 -2
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/task.js +1 -1
- package/lib/powerquery-language-services/inspection/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/task.js +2 -2
- package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
- package/lib/powerquery-language-services/inspectionUtils.js +1 -1
- package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js +2 -2
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js.map +1 -1
- package/lib/powerquery-language-services/validate/validate.js +10 -0
- package/lib/powerquery-language-services/validate/validate.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js +2 -2
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js.map +1 -1
- package/lib/powerquery-language-services/validate/validationSettings/validationSettings.d.ts +1 -0
- package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js +1 -0
- package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js.map +1 -1
- package/package.json +1 -1
|
@@ -106,7 +106,7 @@ async function dereferenceScopeItem(inspectionSettings, nodeIdMapCollection, ide
|
|
|
106
106
|
trace.exit({ [trace_1.TraceConstant.Result]: initialTriedNodeScope.kind });
|
|
107
107
|
return initialTriedNodeScope;
|
|
108
108
|
}
|
|
109
|
-
let currentScopeItem = initialTriedNodeScope.value.get(language_1.AstUtils.getIdentifierLiteral(initialIdentifierXorNode.node));
|
|
109
|
+
let currentScopeItem = initialTriedNodeScope.value.scopeItemByKey.get(language_1.AstUtils.getIdentifierLiteral(initialIdentifierXorNode.node));
|
|
110
110
|
let currentIdentifierLiteral = language_1.AstUtils.getIdentifierLiteral(initialIdentifierXorNode.node);
|
|
111
111
|
if (currentScopeItem === undefined) {
|
|
112
112
|
return onIdentifierNotInScope(dereferencedPath, identifierAstXorNode, trace, updatedSettings, currentIdentifierLiteral);
|
|
@@ -140,7 +140,7 @@ async function dereferenceScopeItem(inspectionSettings, nodeIdMapCollection, ide
|
|
|
140
140
|
trace.exit({ [trace_1.TraceConstant.Result]: triedNodeScope.kind });
|
|
141
141
|
return triedNodeScope;
|
|
142
142
|
}
|
|
143
|
-
const nextScopeItem = triedNodeScope.value.get(currentIdentifierLiteral);
|
|
143
|
+
const nextScopeItem = triedNodeScope.value.scopeItemByKey.get(currentIdentifierLiteral);
|
|
144
144
|
if (nextScopeItem === undefined) {
|
|
145
145
|
return onIdentifierNotInScope(dereferencedPath, currentXorNode, trace, updatedSettings, currentIdentifierLiteral);
|
|
146
146
|
}
|
|
@@ -197,7 +197,7 @@ async function dereferenceScopeItem(inspectionSettings, nodeIdMapCollection, ide
|
|
|
197
197
|
function findNonRecursiveScopeItemInAncestors(nodeIdMapCollection, scopeById, identifierLiteral, initialNodeId) {
|
|
198
198
|
let currentNodeId = nodeIdMapCollection.parentIdById.get(initialNodeId);
|
|
199
199
|
while (currentNodeId) {
|
|
200
|
-
const scopeItem = scopeById.get(currentNodeId)?.get(identifierLiteral);
|
|
200
|
+
const scopeItem = scopeById.get(currentNodeId)?.scopeItemByKey.get(identifierLiteral);
|
|
201
201
|
if (scopeItem && !scopeItem.isRecursive) {
|
|
202
202
|
return scopeItem;
|
|
203
203
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dereferencedIdentifierUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/dereferencedIdentifier/dereferencedIdentifierUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiDlC,gFA4CC;AA3FD,kEAAoD;AACpD,oEAAmE;AACnE,0FAAuH;AACvH,sFAMmE;AACnE,2FAAuG;AAGvG,oCAA4F;AAC5F,uEAKoC;AACpC,6BAAsF;AACtF,uCAAsD;AAEtD,kEAAkE;AAClE,kDAAkD;AAClD,iBAAiB;AACjB,qBAAqB;AACrB,cAAc;AACd,EAAE;AACF,wFAAwF;AACxF,EAAE;AACF,uCAAuC;AACvC,4CAA4C;AAC5C,EAAE;AACF,mBAAmB;AACnB,MAAM;AACN,wCAAwC;AACxC,0FAA0F;AAC1F,KAAK;AACL,4BAA4B;AAC5B,EAAE;AACF,mBAAmB;AACnB,MAAM;AACN,wCAAwC;AACxC,2FAA2F;AAC3F,KAAK;AACL,4BAA4B;AACrB,KAAK,UAAU,kCAAkC,CACpD,kBAAsC,EACtC,mBAAyC,EACzC,OAAiB;AACjB,qDAAqD;AACrD,0DAA0D;AAC1D,YAAuB,IAAI,GAAG,EAAE;IAEhC,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,YAAY,EACpC,kCAAkC,CAAC,IAAI,EACvC,kBAAkB,CAAC,oBAAoB,EACvC,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;IAEF,MAAM,eAAe,GAAuB;QACxC,GAAG,kBAAkB;QACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE;KACjC,CAAC;IAEF,IAAI,CAAC;QACD,qBAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAEzC,IAAI,qBAAY,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YAClC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAEjD,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,sCAAsC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAClG,CAAC;QAED,MAAM,iBAAiB,GAGnB,MAAM,oBAAoB,CAAC,eAAe,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAElG,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAAC,OAAO,MAAe,EAAE,CAAC;QACvB,0BAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAEjC,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,+BAAW,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;IACnG,CAAC;AACL,CAAC;AAED,KAAK,UAAU,oBAAoB,CAC/B,kBAAsC,EACtC,mBAAyC,EACzC,oBAA2E,EAC3E,SAAoB,EACpB,wBAA+E;IAE/E,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,CACtD,+BAAuB,CAAC,YAAY,EACpC,oBAAoB,CAAC,IAAI,EACzB,kBAAkB,CAAC,oBAAoB,EACvC,cAAU,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAClD,CAAC;IAEF,MAAM,eAAe,GAAuB;QACxC,GAAG,kBAAkB;QACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE;KACjC,CAAC;IAEF,MAAM,gBAAgB,GAA8B,EAAE,CAAC;IAEvD,MAAM,qBAAqB,GAA8B,MAAM,IAAA,kCAA0B,EACrF,eAAe,EACf,mBAAmB,EACnB,eAAe,CAAC,aAAa,EAC7B,wBAAwB,CAAC,IAAI,CAAC,EAAE,EAChC,SAAS,CACZ,CAAC;IAEF,IAAI,+BAAW,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC;QAC7C,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,qBAAqB,CAAC,IAAI,EAAE,CAAC,CAAC;QAEnE,OAAO,qBAAqB,CAAC;IACjC,CAAC;IAED,IAAI,gBAAgB,GAA2B,qBAAqB,CAAC,KAAK,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"dereferencedIdentifierUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/dereferencedIdentifier/dereferencedIdentifierUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,7 +105,7 @@ async function getIsNameInLocalScope(settings, nodeIdMapCollection, typeCache, i
|
|
|
105
105
|
if (name !== undefined) {
|
|
106
106
|
// Seed local scope
|
|
107
107
|
const scope = powerquery_parser_1.ResultUtils.assertOk(await (0, scope_1.assertGetOrCreateNodeScope)(updatedSettings, nodeIdMapCollection, updatedSettings.eachScopeById, invokeExpressionXorNode.node.id, typeCache.scopeById));
|
|
108
|
-
const nameScopeItem = scope.get(name);
|
|
108
|
+
const nameScopeItem = scope.scopeItemByKey.get(name);
|
|
109
109
|
trace.exit();
|
|
110
110
|
return nameScopeItem !== undefined && nameScopeItem.kind !== scope_1.ScopeItemKind.Undefined;
|
|
111
111
|
}
|
package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invokeExpression.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/invokeExpression/invokeExpression.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"invokeExpression.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/invokeExpression/invokeExpression.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,10 @@ import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/par
|
|
|
4
4
|
export type ScopeTypeByKey = Map<string, Type.TPowerQueryType>;
|
|
5
5
|
export type TriedNodeScope = PQP.Result<NodeScope, PQP.CommonError.CommonError>;
|
|
6
6
|
export type ScopeById = Map<number, NodeScope>;
|
|
7
|
-
export
|
|
7
|
+
export interface NodeScope {
|
|
8
|
+
readonly createdForNodeId: number | undefined;
|
|
9
|
+
readonly scopeItemByKey: ReadonlyMap<string, TScopeItem>;
|
|
10
|
+
}
|
|
8
11
|
export type TScopeItem = EachScopeItem | LetVariableScopeItem | ParameterScopeItem | RecordFieldScopeItem | SectionMemberScopeItem | UndefinedScopeItem;
|
|
9
12
|
export type TKeyValuePairScopeItem = LetVariableScopeItem | RecordFieldScopeItem | SectionMemberScopeItem;
|
|
10
13
|
export declare enum ScopeItemKind {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scope.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scope.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;
|
|
1
|
+
{"version":3,"file":"scope.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scope.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAoClC,IAAY,aAOX;AAPD,WAAY,aAAa;IACrB,8BAAa,CAAA;IACb,4CAA2B,CAAA;IAC3B,wCAAuB,CAAA;IACvB,4CAA2B,CAAA;IAC3B,gDAA+B,CAAA;IAC/B,wCAAuB,CAAA;AAC3B,CAAC,EAPW,aAAa,6BAAb,aAAa,QAOxB"}
|
|
@@ -1,9 +1,43 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
5
|
+
if (k2 === undefined) k2 = k;
|
|
6
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
7
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
8
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
9
|
+
}
|
|
10
|
+
Object.defineProperty(o, k2, desc);
|
|
11
|
+
}) : (function(o, m, k, k2) {
|
|
12
|
+
if (k2 === undefined) k2 = k;
|
|
13
|
+
o[k2] = m[k];
|
|
14
|
+
}));
|
|
15
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
16
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
17
|
+
}) : function(o, v) {
|
|
18
|
+
o["default"] = v;
|
|
19
|
+
});
|
|
20
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
21
|
+
var ownKeys = function(o) {
|
|
22
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
23
|
+
var ar = [];
|
|
24
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
25
|
+
return ar;
|
|
26
|
+
};
|
|
27
|
+
return ownKeys(o);
|
|
28
|
+
};
|
|
29
|
+
return function (mod) {
|
|
30
|
+
if (mod && mod.__esModule) return mod;
|
|
31
|
+
var result = {};
|
|
32
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
33
|
+
__setModuleDefault(result, mod);
|
|
34
|
+
return result;
|
|
35
|
+
};
|
|
36
|
+
})();
|
|
4
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
38
|
exports.tryNodeScope = tryNodeScope;
|
|
6
39
|
exports.assertGetOrCreateNodeScope = assertGetOrCreateNodeScope;
|
|
40
|
+
const PQP = __importStar(require("@microsoft/powerquery-parser"));
|
|
7
41
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
8
42
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
9
43
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
@@ -23,7 +57,7 @@ scopeById) {
|
|
|
23
57
|
const result = await powerquery_parser_1.ResultUtils.ensureResultAsync(async () => {
|
|
24
58
|
const ancestry = parser_1.AncestryUtils.assertAncestry(nodeIdMapCollection, nodeId);
|
|
25
59
|
if (ancestry.length === 0) {
|
|
26
|
-
|
|
60
|
+
throw new PQP.CommonError.InvariantError(`expected ancestry to have at least one node`, { nodeId });
|
|
27
61
|
}
|
|
28
62
|
await inspectScope(updatedSettings, nodeIdMapCollection, eachScopeById, ancestry, scopeById, trace.id);
|
|
29
63
|
const result = powerquery_parser_1.MapUtils.assertGet(scopeById, nodeId, `expected nodeId in scope result`, {
|
|
@@ -55,6 +89,74 @@ scopeById) {
|
|
|
55
89
|
trace.exit({ [trace_1.TraceConstant.IsThrowing]: false });
|
|
56
90
|
return triedNodeScope;
|
|
57
91
|
}
|
|
92
|
+
// The only function that should directly mutate `ScopeInspectionState.scopeById`.
|
|
93
|
+
// It attempts to reuse the inherited scope instance whenever:
|
|
94
|
+
// 1. there's no `newEntries`,
|
|
95
|
+
// 2. the node is not a FieldSelector or FieldProjection (which have special scoping rules)
|
|
96
|
+
//
|
|
97
|
+
// For scenario (1) we take a shallow copy of the parent's scope, then merge in the new entries.
|
|
98
|
+
// This means the `newEntries` take precedence over the inherited scope.
|
|
99
|
+
//
|
|
100
|
+
// For scenario (2) we only inherit `EachScopeItem`s from the parent scope.
|
|
101
|
+
function assignScopeForNodeId(state, nodeId, inheritedScope, newEntries, correlationId) {
|
|
102
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, assignScopeForNodeId.name, correlationId, { nodeId });
|
|
103
|
+
// If a scope has already been generated for this nodeId, return it.
|
|
104
|
+
// This can happen as a parent might have assigned a scope to its child already,
|
|
105
|
+
// e.g. LetExpression assigns scope to its expression.
|
|
106
|
+
const existingNodeScope = state.scopeById.get(nodeId);
|
|
107
|
+
if (existingNodeScope !== undefined) {
|
|
108
|
+
trace.exit({ [trace_1.TraceConstant.Result]: "cache hit" });
|
|
109
|
+
return existingNodeScope;
|
|
110
|
+
}
|
|
111
|
+
// Unique case for root node.
|
|
112
|
+
if (inheritedScope === undefined) {
|
|
113
|
+
const nodeScope = {
|
|
114
|
+
createdForNodeId: nodeId,
|
|
115
|
+
scopeItemByKey: new Map(newEntries ?? []),
|
|
116
|
+
};
|
|
117
|
+
state.scopeById.set(nodeId, nodeScope);
|
|
118
|
+
trace.exit({ [trace_1.TraceConstant.Result]: "new root scope" });
|
|
119
|
+
return nodeScope;
|
|
120
|
+
}
|
|
121
|
+
const xorNode = parser_1.NodeIdMapUtils.assertXor(state.nodeIdMapCollection, nodeId);
|
|
122
|
+
// We can't actually inherit everything if node is a FieldSelector or FieldProjection,
|
|
123
|
+
// so we create a new scope that only includes allowed items.
|
|
124
|
+
if ([language_1.Ast.NodeKind.FieldProjection, language_1.Ast.NodeKind.FieldSelector].includes(xorNode.node.kind)) {
|
|
125
|
+
const inheritedEachScopeItemEntries = [
|
|
126
|
+
...inheritedScope.scopeItemByKey.entries(),
|
|
127
|
+
].filter(([_key, scopeItem]) => scopeItem.kind === scope_1.ScopeItemKind.Each);
|
|
128
|
+
const nodeScope = {
|
|
129
|
+
createdForNodeId: nodeId,
|
|
130
|
+
scopeItemByKey: new Map([...inheritedEachScopeItemEntries, ...(newEntries ?? [])]),
|
|
131
|
+
};
|
|
132
|
+
state.scopeById.set(nodeId, nodeScope);
|
|
133
|
+
trace.exit({ [trace_1.TraceConstant.Result]: "inherited filtered scope" });
|
|
134
|
+
return nodeScope;
|
|
135
|
+
}
|
|
136
|
+
// Else if there are no new entries we can simply inherit the scope.
|
|
137
|
+
else if (!newEntries) {
|
|
138
|
+
state.scopeById.set(nodeId, inheritedScope);
|
|
139
|
+
trace.exit({ [trace_1.TraceConstant.Result]: "inherited scope" });
|
|
140
|
+
return inheritedScope;
|
|
141
|
+
}
|
|
142
|
+
// Else there are new entries so we create a new scope that merges the inherited scope with the new entries.
|
|
143
|
+
else {
|
|
144
|
+
const nodeScope = {
|
|
145
|
+
createdForNodeId: nodeId,
|
|
146
|
+
scopeItemByKey: new Map([...inheritedScope.scopeItemByKey.entries(), ...newEntries]),
|
|
147
|
+
};
|
|
148
|
+
state.scopeById.set(nodeId, nodeScope);
|
|
149
|
+
trace.exit({ [trace_1.TraceConstant.Result]: "created new scope" });
|
|
150
|
+
return nodeScope;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
function getParentScope(state, nodeId) {
|
|
154
|
+
const parentNodeId = state.nodeIdMapCollection.parentIdById.get(nodeId);
|
|
155
|
+
if (parentNodeId === undefined) {
|
|
156
|
+
return undefined;
|
|
157
|
+
}
|
|
158
|
+
return state.scopeById.get(parentNodeId);
|
|
159
|
+
}
|
|
58
160
|
async function inspectScope(settings, nodeIdMapCollection, eachScopeById, ancestry,
|
|
59
161
|
// scopeById may get mutated by adding new entries.
|
|
60
162
|
scopeById, correlationId) {
|
|
@@ -68,7 +170,7 @@ scopeById, correlationId) {
|
|
|
68
170
|
}
|
|
69
171
|
const state = {
|
|
70
172
|
traceManager: settings.traceManager,
|
|
71
|
-
|
|
173
|
+
scopeById,
|
|
72
174
|
ancestry,
|
|
73
175
|
nodeIdMapCollection,
|
|
74
176
|
eachScopeById,
|
|
@@ -108,34 +210,46 @@ async function inspectNode(state, xorNode, correlationId) {
|
|
|
108
210
|
inspectSection(state, xorNode, trace.id);
|
|
109
211
|
break;
|
|
110
212
|
default:
|
|
111
|
-
|
|
213
|
+
assignScopeForNodeId(state, xorNode.node.id, getParentScope(state, xorNode.node.id),
|
|
214
|
+
/* newEntries */ undefined, trace.id);
|
|
112
215
|
}
|
|
113
216
|
trace.exit();
|
|
114
217
|
}
|
|
115
218
|
function inspectEachExpression(state, eachExpr, correlationId) {
|
|
116
219
|
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectEachExpression.name, correlationId);
|
|
117
220
|
parser_1.XorNodeUtils.assertIsNodeKind(eachExpr, language_1.Ast.NodeKind.EachExpression);
|
|
118
|
-
|
|
221
|
+
// Generate the scope for the EachExpression
|
|
222
|
+
const nodeScope = assignScopeForNodeId(state, eachExpr.node.id, getParentScope(state, eachExpr.node.id),
|
|
223
|
+
/* newEntries */ undefined, trace.id);
|
|
224
|
+
// Propegate the scope to the paired expression (if one exists)
|
|
225
|
+
const expression = parser_1.NodeIdMapUtils.nthChildXor(state.nodeIdMapCollection, eachExpr.node.id, 1);
|
|
226
|
+
if (expression !== undefined) {
|
|
227
|
+
assignScopeForNodeId(state, expression.node.id, nodeScope,
|
|
228
|
+
// Append the implicit "_" parameter for the 'each' expression.
|
|
119
229
|
[
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
230
|
+
[
|
|
231
|
+
"_",
|
|
232
|
+
{
|
|
233
|
+
kind: scope_1.ScopeItemKind.Each,
|
|
234
|
+
nodeId: eachExpr.node.id,
|
|
235
|
+
isRecursive: false,
|
|
236
|
+
eachExpression: eachExpr,
|
|
237
|
+
implicitParameterType: state.eachScopeById?.get(eachExpr.node.id) ?? language_1.Type.UnknownInstance,
|
|
238
|
+
},
|
|
239
|
+
],
|
|
240
|
+
], trace.id);
|
|
241
|
+
}
|
|
130
242
|
trace.exit();
|
|
131
243
|
}
|
|
132
244
|
function inspectFunctionExpression(state, fnExpr, correlationId) {
|
|
133
245
|
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectFunctionExpression.name, correlationId);
|
|
134
246
|
parser_1.XorNodeUtils.assertIsNodeKind(fnExpr, language_1.Ast.NodeKind.FunctionExpression);
|
|
135
|
-
//
|
|
136
|
-
const nodeScope =
|
|
137
|
-
|
|
247
|
+
// Creates the NodeScope for the FunctionExpression.
|
|
248
|
+
const nodeScope = assignScopeForNodeId(state, fnExpr.node.id, getParentScope(state, fnExpr.node.id),
|
|
249
|
+
/* newEntries */ undefined, trace.id);
|
|
250
|
+
// Build up a list of new scope items derived from the function's parameters.
|
|
138
251
|
const newEntries = [];
|
|
252
|
+
const pseudoType = (0, pseudoFunctionExpressionType_1.pseudoFunctionExpressionType)(state.nodeIdMapCollection, fnExpr);
|
|
139
253
|
for (const parameter of pseudoType.parameters) {
|
|
140
254
|
const type = parameter.type
|
|
141
255
|
? language_1.TypeUtils.primitiveTypeConstantKindFromTypeKind(parameter.type)
|
|
@@ -145,26 +259,35 @@ function inspectFunctionExpression(state, fnExpr, correlationId) {
|
|
|
145
259
|
newEntries.push([scopeKey, parameterScopeItem]);
|
|
146
260
|
}
|
|
147
261
|
}
|
|
148
|
-
|
|
262
|
+
// Propagate the FunctionExpression's scope to its body.
|
|
263
|
+
const functionExpressionBody = parser_1.NodeIdMapUtils.nthChildXor(state.nodeIdMapCollection, fnExpr.node.id, 3);
|
|
264
|
+
if (functionExpressionBody !== undefined) {
|
|
265
|
+
assignScopeForNodeId(state, functionExpressionBody.node.id, nodeScope, newEntries, trace.id);
|
|
266
|
+
}
|
|
149
267
|
trace.exit();
|
|
150
268
|
}
|
|
151
269
|
function inspectLetExpression(state, letExpr, correlationId) {
|
|
152
270
|
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectLetExpression.name, correlationId);
|
|
153
271
|
parser_1.XorNodeUtils.assertIsNodeKind(letExpr, language_1.Ast.NodeKind.LetExpression);
|
|
154
|
-
//
|
|
155
|
-
const nodeScope =
|
|
272
|
+
// Creates the NodeScope for the LetExpression.
|
|
273
|
+
const nodeScope = assignScopeForNodeId(state, letExpr.node.id, getParentScope(state, letExpr.node.id),
|
|
274
|
+
/* newEntries */ undefined, trace.id);
|
|
156
275
|
const keyValuePairs = parser_1.NodeIdMapIterator.iterLetExpression(state.nodeIdMapCollection, letExpr);
|
|
157
276
|
inspectKeyValuePairs(state, nodeScope, keyValuePairs, { allowRecursive: true }, scopeItemFactoryForLetVariable, trace.id);
|
|
158
277
|
// Places the assignments from the 'let' into LetExpression.expression
|
|
159
278
|
const newEntries = scopeItemFactoryForKeyValuePairs(keyValuePairs, -1, { allowRecursive: true }, scopeItemFactoryForLetVariable);
|
|
160
|
-
|
|
279
|
+
const expression = parser_1.NodeIdMapUtils.nthChildXor(state.nodeIdMapCollection, letExpr.node.id, 3);
|
|
280
|
+
if (expression !== undefined) {
|
|
281
|
+
assignScopeForNodeId(state, expression.node.id, nodeScope, newEntries, trace.id);
|
|
282
|
+
}
|
|
161
283
|
trace.exit();
|
|
162
284
|
}
|
|
163
285
|
function inspectRecordExpressionOrRecordLiteral(state, record, correlationId) {
|
|
164
286
|
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectRecordExpressionOrRecordLiteral.name, correlationId);
|
|
165
287
|
parser_1.XorNodeUtils.assertIsRecord(record);
|
|
166
|
-
//
|
|
167
|
-
const nodeScope =
|
|
288
|
+
// Creates the NodeScope for the record.
|
|
289
|
+
const nodeScope = assignScopeForNodeId(state, record.node.id, getParentScope(state, record.node.id),
|
|
290
|
+
/* newEntries */ undefined, trace.id);
|
|
168
291
|
const keyValuePairs = parser_1.NodeIdMapIterator.iterRecord(state.nodeIdMapCollection, record);
|
|
169
292
|
inspectKeyValuePairs(state, nodeScope, keyValuePairs, {
|
|
170
293
|
allowGeneralizedIdentifier: true,
|
|
@@ -181,90 +304,26 @@ function inspectSection(state, section, correlationId) {
|
|
|
181
304
|
if (kvp.value === undefined) {
|
|
182
305
|
continue;
|
|
183
306
|
}
|
|
184
|
-
|
|
185
|
-
if (newScopeItems.length !== 0) {
|
|
186
|
-
expandScope(state, kvp.value, newScopeItems, new Map(), trace.id);
|
|
187
|
-
}
|
|
307
|
+
assignScopeForNodeId(state, kvp.value.node.id, getParentScope(state, kvp.value.node.id), scopeItemFactoryForKeyValuePairs(keyValuePairs, kvp.key.id, { allowRecursive: true }, scopeItemFactoryForSectionMember), trace.id);
|
|
188
308
|
}
|
|
189
309
|
trace.exit();
|
|
190
310
|
}
|
|
191
311
|
// Expands the scope on the value part of the key value pair.
|
|
192
|
-
function inspectKeyValuePairs(state,
|
|
312
|
+
function inspectKeyValuePairs(state, inheritedScope, keyValuePairs, getAllowedIdentifiersOptions, scopeItemFactory, correlationId) {
|
|
193
313
|
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectKeyValuePairs.name, correlationId);
|
|
194
314
|
for (const kvp of keyValuePairs) {
|
|
195
315
|
state.cancellationToken?.throwIfCancelled();
|
|
196
316
|
if (kvp.value === undefined) {
|
|
197
317
|
continue;
|
|
198
318
|
}
|
|
199
|
-
|
|
200
|
-
if (newScopeItems.length !== 0) {
|
|
201
|
-
expandScope(state, kvp.value, newScopeItems, parentScope, trace.id);
|
|
202
|
-
}
|
|
319
|
+
assignScopeForNodeId(state, kvp.value.node.id, inheritedScope, scopeItemFactoryForKeyValuePairs(keyValuePairs, kvp.key.id, getAllowedIdentifiersOptions, scopeItemFactory), trace.id);
|
|
203
320
|
}
|
|
204
321
|
trace.exit();
|
|
205
322
|
}
|
|
206
|
-
function
|
|
207
|
-
const nodeScope = localGetOrCreateNodeScope(state, xorNode.node.id, defaultScope, correlationId);
|
|
208
|
-
for (const [key, value] of newEntries) {
|
|
209
|
-
nodeScope.set(key, value);
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
|
-
function expandChildScope(state, parent, childAttributeIds, newEntries, defaultScope, correlationId) {
|
|
213
|
-
const nodeIdMapCollection = state.nodeIdMapCollection;
|
|
214
|
-
const parentId = parent.node.id;
|
|
215
|
-
// TODO: optimize this
|
|
216
|
-
for (const attributeId of childAttributeIds) {
|
|
217
|
-
const child = parser_1.NodeIdMapUtils.nthChildXor(nodeIdMapCollection, parentId, attributeId);
|
|
218
|
-
if (child !== undefined) {
|
|
219
|
-
expandScope(state, child, newEntries, defaultScope, correlationId);
|
|
220
|
-
}
|
|
221
|
-
}
|
|
222
|
-
}
|
|
223
|
-
// Any operation done on a scope should first invoke `scopeFor` for data integrity.
|
|
224
|
-
function localGetOrCreateNodeScope(state, nodeId, defaultScope, correlationId) {
|
|
225
|
-
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, localGetOrCreateNodeScope.name, correlationId, { nodeId });
|
|
226
|
-
// If scopeFor has already been called then there should be a nodeId in the givenScope.
|
|
227
|
-
const givenScope = state.givenScope.get(nodeId);
|
|
228
|
-
if (givenScope !== undefined) {
|
|
229
|
-
trace.exit({ [trace_1.TraceConstant.Result]: "givenScope cache hit" });
|
|
230
|
-
return givenScope;
|
|
231
|
-
}
|
|
232
|
-
if (defaultScope !== undefined) {
|
|
233
|
-
const shallowCopy = new Map(defaultScope.entries());
|
|
234
|
-
state.givenScope.set(nodeId, shallowCopy);
|
|
235
|
-
trace.exit({ [trace_1.TraceConstant.Result]: "defaultScope entry" });
|
|
236
|
-
return shallowCopy;
|
|
237
|
-
}
|
|
238
|
-
// Default to a parent's scope if the node has a parent.
|
|
239
|
-
// Special handling is needed for FieldProjection/FieldSelector which should only copy the EachExpression scope.
|
|
240
|
-
const parent = parser_1.NodeIdMapUtils.parentXor(state.nodeIdMapCollection, nodeId);
|
|
241
|
-
if (parent !== undefined) {
|
|
242
|
-
const parentNodeId = parent.node.id;
|
|
243
|
-
const parentGivenScope = state.givenScope.get(parentNodeId);
|
|
244
|
-
if (parentGivenScope !== undefined) {
|
|
245
|
-
const xorNode = parser_1.NodeIdMapUtils.assertXor(state.nodeIdMapCollection, nodeId);
|
|
246
|
-
let shallowCopy;
|
|
247
|
-
if ([language_1.Ast.NodeKind.FieldProjection, language_1.Ast.NodeKind.FieldSelector].includes(xorNode.node.kind)) {
|
|
248
|
-
shallowCopy = powerquery_parser_1.MapUtils.filter(parentGivenScope, (_key, value) => value.kind === scope_1.ScopeItemKind.Each);
|
|
249
|
-
}
|
|
250
|
-
else {
|
|
251
|
-
shallowCopy = new Map(parentGivenScope.entries());
|
|
252
|
-
}
|
|
253
|
-
state.givenScope.set(nodeId, shallowCopy);
|
|
254
|
-
trace.exit({ [trace_1.TraceConstant.Result]: "parent givenScope hit" });
|
|
255
|
-
return shallowCopy;
|
|
256
|
-
}
|
|
257
|
-
}
|
|
258
|
-
// The node has no parent or it hasn't been visited.
|
|
259
|
-
const newScope = new Map();
|
|
260
|
-
state.givenScope.set(nodeId, newScope);
|
|
261
|
-
trace.exit({ [trace_1.TraceConstant.Result]: "set new entry" });
|
|
262
|
-
return newScope;
|
|
263
|
-
}
|
|
264
|
-
function scopeItemFactoryForKeyValuePairs(keyValuePairs, ancestorKeyNodeId, getAllowedIdentifiersOptions, scopeItemFactory) {
|
|
323
|
+
function scopeItemFactoryForKeyValuePairs(keyValuePairs, keyNodeId, getAllowedIdentifiersOptions, scopeItemFactory) {
|
|
265
324
|
const result = [];
|
|
266
325
|
for (const kvp of keyValuePairs.filter((keyValuePair) => keyValuePair.value !== undefined)) {
|
|
267
|
-
const isRecursive =
|
|
326
|
+
const isRecursive = keyNodeId === kvp.key.id;
|
|
268
327
|
for (const key of language_1.IdentifierUtils.getAllowedIdentifiers(kvp.key.literal, getAllowedIdentifiersOptions)) {
|
|
269
328
|
if (!isRecursive || key.includes("@")) {
|
|
270
329
|
result.push([key, scopeItemFactory(kvp, isRecursive)]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeInspection.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scopeInspection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"scopeInspection.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scopeInspection.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,14 +80,14 @@ function isUndefined(value) {
|
|
|
80
80
|
return value?.kind === scope_1.ScopeItemKind.Undefined;
|
|
81
81
|
}
|
|
82
82
|
function getScopeItemChecked(nodeScope, key, kind) {
|
|
83
|
-
const scopeItem = nodeScope.get(key);
|
|
83
|
+
const scopeItem = nodeScope.scopeItemByKey.get(key);
|
|
84
84
|
if (scopeItem?.kind !== kind) {
|
|
85
85
|
return undefined;
|
|
86
86
|
}
|
|
87
87
|
return scopeItem;
|
|
88
88
|
}
|
|
89
89
|
function findScopeItemByLiteral(nodeScope, literalString) {
|
|
90
|
-
return nodeScope?.get(literalString);
|
|
90
|
+
return nodeScope?.scopeItemByKey.get(literalString);
|
|
91
91
|
}
|
|
92
92
|
function scopeCreatorIdentifier(scopeItem) {
|
|
93
93
|
if (!scopeItem) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scopeUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCA,8DAQC;AAED,wBAEC;AAED,sCAEC;AAED,kCAEC;AAED,sCAEC;AAED,0CAEC;AAED,kCAEC;AAED,kDAYC;AAED,wDAKC;AAED,wDAuBC;AAED,wEAuBC;AAvID,uCAAuC;AACvC,kCAAkC;AAClC,kEAAoD;AAapD,mCAUiB;AACjB,0FAAkF;AAGlF,0CAAwB;AACxB,oDAAkC;AAElC,SAAgB,yBAAyB,CAAuB,SAAoB,EAAE,GAAW,EAAE,IAAe;IAC9G,MAAM,SAAS,GAAkB,mBAAmB,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAE3E,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,eAAe,IAAI,0BAA0B,GAAG,GAAG,CAAC,CAAC;IAClG,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAgB,MAAM,CAAC,KAA6B;IAChD,OAAO,KAAK,EAAE,IAAI,KAAK,qBAAa,CAAC,IAAI,CAAC;AAC9C,CAAC;AAED,SAAgB,aAAa,CAAC,KAA6B;IACvD,OAAO,KAAK,EAAE,IAAI,KAAK,qBAAa,CAAC,WAAW,CAAC;AACrD,CAAC;AAED,SAAgB,WAAW,CAAC,KAA6B;IACrD,OAAO,KAAK,EAAE,IAAI,KAAK,qBAAa,CAAC,SAAS,CAAC;AACnD,CAAC;AAED,SAAgB,aAAa,CAAC,KAA6B;IACvD,OAAO,KAAK,EAAE,IAAI,KAAK,qBAAa,CAAC,WAAW,CAAC;AACrD,CAAC;AAED,SAAgB,eAAe,CAAC,KAA6B;IACzD,OAAO,KAAK,EAAE,IAAI,KAAK,qBAAa,CAAC,aAAa,CAAC;AACvD,CAAC;AAED,SAAgB,WAAW,CAAC,KAA6B;IACrD,OAAO,KAAK,EAAE,IAAI,KAAK,qBAAa,CAAC,SAAS,CAAC;AACnD,CAAC;AAED,SAAgB,mBAAmB,CAC/B,SAAoB,EACpB,GAAW,EACX,IAAe;IAEf,MAAM,SAAS,GAA2B,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"scopeUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scopeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -162,7 +162,7 @@ typeCache = typeCache_1.TypeCacheUtils.emptyCache()) {
|
|
|
162
162
|
triedExpectedType = (0, expectedType_1.tryExpectedType)(updatedSettings, activeNode);
|
|
163
163
|
}
|
|
164
164
|
else {
|
|
165
|
-
triedNodeScope = Promise.resolve(PQP.ResultUtils.
|
|
165
|
+
triedNodeScope = Promise.resolve(PQP.ResultUtils.error(new PQP.CommonError.CommonError(new PQP.CommonError.InvariantError("ActiveNode is out of bounds"))));
|
|
166
166
|
triedScopeType = Promise.resolve(PQP.ResultUtils.ok(new Map()));
|
|
167
167
|
triedExpectedType = PQP.ResultUtils.ok(undefined);
|
|
168
168
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgKlC,
|
|
1
|
+
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/task.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,14 +33,14 @@ typeCache = typeCache_1.TypeCacheUtils.emptyCache()) {
|
|
|
33
33
|
async function inspectScopeType(state, nodeId, correlationId) {
|
|
34
34
|
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScopeType, inspectScopeType.name, correlationId);
|
|
35
35
|
const nodeScope = await (0, inspectType_1.assertGetOrCreateNodeScope)(state, nodeId, trace.id);
|
|
36
|
-
for (const scopeItem of nodeScope.values()) {
|
|
36
|
+
for (const scopeItem of nodeScope.scopeItemByKey.values()) {
|
|
37
37
|
if (!state.typeById.has(scopeItem.nodeId)) {
|
|
38
38
|
// eslint-disable-next-line no-await-in-loop
|
|
39
39
|
state.typeById.set(scopeItem.nodeId, await (0, inspectType_1.getOrCreateScopeItemType)(state, scopeItem));
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
const result = new Map();
|
|
43
|
-
for (const [key, scopeItem] of nodeScope.entries()) {
|
|
43
|
+
for (const [key, scopeItem] of nodeScope.scopeItemByKey.entries()) {
|
|
44
44
|
const type = powerquery_parser_1.MapUtils.assertGet(state.typeById, scopeItem.nodeId, `expected nodeId to be in givenTypeById`, { nodeId: scopeItem.nodeId });
|
|
45
45
|
result.set(key, type);
|
|
46
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAkBlC,oCA6BC;AAED,0BA2BC;AAzED,oEAAqE;AACrE,sFAAsG;AACtG,2FAAuG;AAGvG,+CAAiG;AACjG,6BAAoE;AACpE,qEAAyF;AAEzF,4CAAyD;AAMlD,KAAK,UAAU,YAAY,CAC9B,QAA4B,EAC5B,mBAAyC,EACzC,MAAc;AACd,oGAAoG;AACpG,4DAA4D;AAC5D,YAAuB,0BAAc,CAAC,UAAU,EAAE;IAElD,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,CAC5C,2BAAuB,CAAC,gBAAgB,EACxC,YAAY,CAAC,IAAI,EACjB,QAAQ,CAAC,oBAAoB,CAChC,CAAC;IAEF,MAAM,KAAK,GAAqB,wCAAqB,CAAC,sBAAsB,CACxE,QAAQ,EACR,mBAAmB,EACnB,SAAS,EACT,KAAK,CAAC,EAAE,CACX,CAAC;IAEF,MAAM,MAAM,GAAmB,MAAM,+BAAW,CAAC,iBAAiB,CAC9D,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,EAC/C,QAAQ,CAAC,MAAM,CAClB,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,OAAO,CACzB,QAA4B,EAC5B,mBAAyC,EACzC,MAAc;AACd,oGAAoG;AACpG,4DAA4D;AAC5D,YAAuB,0BAAc,CAAC,UAAU,EAAE;IAElD,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,CAC5C,2BAAuB,CAAC,WAAW,EACnC,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC,oBAAoB,CAChC,CAAC;IAEF,MAAM,MAAM,GAAc,MAAM,+BAAW,CAAC,iBAAiB,CACzD,GAAG,EAAE,CACD,IAAA,wBAAU,EACN,wCAAqB,CAAC,sBAAsB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,EAChG,uBAAc,CAAC,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,EACrD,KAAK,CAAC,EAAE,CACX,EACL,QAAQ,CAAC,MAAM,CAClB,CAAC;IAEF,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAErD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC3B,KAAuB,EACvB,MAAc,EACd,aAAqB;IAErB,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,gBAAgB,EACxC,gBAAgB,CAAC,IAAI,EACrB,aAAa,CAChB,CAAC;IAEF,MAAM,SAAS,GAAc,MAAM,IAAA,wCAA0B,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAEvF,KAAK,MAAM,SAAS,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ function getAutocompleteItemsFromScope(context) {
|
|
|
37
37
|
const nodeScope = triedNodeScope.value;
|
|
38
38
|
const scopeTypeByKey = powerquery_parser_1.ResultUtils.okOrDefault(triedScopeType, new Map());
|
|
39
39
|
const result = [];
|
|
40
|
-
for (const [label, scopeItem] of nodeScope.entries()) {
|
|
40
|
+
for (const [label, scopeItem] of nodeScope.scopeItemByKey.entries()) {
|
|
41
41
|
const autocompleteItem = autocomplete_1.AutocompleteItemUtils.fromScopeItem(label, scopeItem, scopeTypeByKey.get(label) ?? language_1.Type.UnknownInstance, context);
|
|
42
42
|
if (autocompleteItem) {
|
|
43
43
|
result.push(autocompleteItem);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAalC,gDAWC;AAED,sEA6BC;AAED,8CAOC;AAED,oDAuBC;AAED,gFAoBC;AAED,sDA6BC;AAED,gEAUC;AAED,kDAgBC;AAED,oDAIC;AAED,wFAUC;AA3LD,oEAAmE;AACnE,0FAAwF;AACxF,6EAAyE;AAEzE,wBAA8C;AAC9C,6DAAwE;AAExE,4DAAkE;AAClE,uCAAoC;AAEpC,SAAgB,kBAAkB,CAC9B,QAAsB,EACtB,SAAuC;IAEvC,OAAO;QACH,GAAG,QAAQ;QACX,uBAAuB,EAAE,SAAS,EAAE,uBAAuB,IAAI,IAAI;QACnE,OAAO,EAAE,SAAS,EAAE,OAAO,IAAI,iBAAO,CAAC,WAAW;QAClD,YAAY,EAAE,SAAS,EAAE,YAAY,IAAI,iCAAY,CAAC,QAAQ;QAC9D,aAAa,EAAE,SAAS,EAAE,aAAa,IAAI,SAAS;KACvD,CAAC;AACN,CAAC;AAED,SAAgB,6BAA6B,CACzC,OAAwC;IAExC,MAAM,cAAc,GAA8B,OAAO,CAAC,cAAc,CAAC;IACzE,MAAM,cAAc,GAA8B,OAAO,CAAC,cAAc,CAAC;IAEzE,IAAI,+BAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACd,CAAC;IAED,MAAM,SAAS,GAAyB,cAAc,CAAC,KAAK,CAAC;IAC7D,MAAM,cAAc,GAA8B,+BAAW,CAAC,WAAW,CAAC,cAAc,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IAErG,MAAM,MAAM,GAAkC,EAAE,CAAC;IAEjD,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":"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"}
|
package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js
CHANGED
|
@@ -82,7 +82,7 @@ class LocalDocumentProvider {
|
|
|
82
82
|
if (powerquery_parser_1.ResultUtils.isError(triedNodeScope)) {
|
|
83
83
|
return undefined;
|
|
84
84
|
}
|
|
85
|
-
const scopeItem = triedNodeScope.value.get(context.identifier.literal);
|
|
85
|
+
const scopeItem = triedNodeScope.value.scopeItemByKey.get(context.identifier.literal);
|
|
86
86
|
if (scopeItem === undefined) {
|
|
87
87
|
return undefined;
|
|
88
88
|
}
|
|
@@ -249,7 +249,7 @@ class LocalDocumentProvider {
|
|
|
249
249
|
}
|
|
250
250
|
getHoverForScopeItem(context, nodeScope, scopeType, correlationId) {
|
|
251
251
|
const identifierLiteral = context.identifier.literal;
|
|
252
|
-
const scopeItem = nodeScope.get(identifierLiteral);
|
|
252
|
+
const scopeItem = nodeScope.scopeItemByKey.get(identifierLiteral);
|
|
253
253
|
if (scopeItem === undefined || scopeItem.kind === __1.Inspection.ScopeItemKind.Undefined) {
|
|
254
254
|
return undefined;
|
|
255
255
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localDocumentProvider.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,sFAKmE;AACnE,0FAAmG;AACnG,oEAAgF;AAChF,6EAAoH;AAGpH,uEAAyD;AAWzD,6BAAkD;AAClD,mDAAsD;AACtD,iEAAqE;AAErE,uCAAoD;AACpD,iDAA8C;AAE9C,MAAa,qBAAqB;IACb,GAAG,CAAc;IACjB,SAAS,CAAuB;IAChC,OAAO,CAAW;IAChB,MAAM,CAAS;IAElC,YAAY,GAAgB,EAAE,SAA+B,EAAE,OAAiB,EAAE,MAAc;QAC5F,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEM,oBAAoB,CACvB,OAAwC;QAExC,yCAAyC;QACzC,OAAO,+BAAW,CAAC,iBAAiB,CAAC,KAAK,IAAI,EAAE;YAC5C,MAAM,KAAK,GAAU,OAAO,CAAC,YAAY,CAAC,KAAK,CAC3C,6BAAqB,CAAC,2BAA2B,EACjD,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAC9B,OAAO,CAAC,oBAAoB,CAC/B,CAAC;YAEF,OAAO,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;YAE9C,MAAM,iBAAiB,GAAkC;gBACrD,GAAG,IAAI,CAAC,mCAAmC,CAAC,OAAO,CAAC,YAAY,CAAC;aACpE,CAAC,MAAM,CAAC,eAAe,CAAC,6BAA6B,CAAC,OAAO,CAAC,CAAC,CAAC;YAEjE,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,iBAAiB,CAAC;QAC7B,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAEM,aAAa,CAChB,OAAkC;QAElC,yCAAyC;QACzC,OAAO,+BAAW,CAAC,iBAAiB,CAAC,KAAK,IAAI,EAAE;YAC5C,MAAM,KAAK,GAAU,OAAO,CAAC,YAAY,CAAC,KAAK,CAC3C,6BAAqB,CAAC,2BAA2B,EACjD,IAAI,CAAC,aAAa,CAAC,IAAI,EACvB,OAAO,CAAC,oBAAoB,CAC/B,CAAC;YAEF,OAAO,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;YAE9C,IACI,OAAO,CAAC,UAAU,CAAC,IAAI,KAAK,cAAG,CAAC,QAAQ,CAAC,qBAAqB;gBAC9D,OAAO,CAAC,UAAU,CAAC,qBAAqB,KAAK,cAAG,CAAC,qBAAqB,CAAC,KAAK,EAC9E,CAAC;gBACC,OAAO,SAAS,CAAC;YACrB,CAAC;YAED,MAAM,cAAc,GAA8B,OAAO,CAAC,cAAc,CAAC;YAEzE,IAAI,+BAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;gBACtC,OAAO,SAAS,CAAC;YACrB,CAAC;YAED,MAAM,SAAS,GAAsC,cAAc,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"localDocumentProvider.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,16 @@ function validate(textDocument, analysisSettings, validationSettings) {
|
|
|
25
25
|
trace.exit();
|
|
26
26
|
return undefined;
|
|
27
27
|
}
|
|
28
|
+
// If we have a parse error and checkDiagnosticsOnParseError is false,
|
|
29
|
+
// only return parse error diagnostics without checking other validations
|
|
30
|
+
if (parseError !== undefined && !validationSettings.checkDiagnosticsOnParseError) {
|
|
31
|
+
const result = {
|
|
32
|
+
diagnostics: await (0, validateParse_1.validateParse)(parseError, updatedSettings),
|
|
33
|
+
hasSyntaxError: true,
|
|
34
|
+
};
|
|
35
|
+
trace.exit();
|
|
36
|
+
return result;
|
|
37
|
+
}
|
|
28
38
|
let functionExpressionDiagnostics;
|
|
29
39
|
let invokeExpressionDiagnostics;
|
|
30
40
|
let unknownIdentifiersDiagnostics;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAmBlC,
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,14 +66,14 @@ function findUnknownIdentifiers(validationSettings, identifiersWithNodeScope, co
|
|
|
66
66
|
const identifier = identifierWithNodeScope.identifier;
|
|
67
67
|
const nodeScope = identifierWithNodeScope.triedNodeScope.value;
|
|
68
68
|
const literal = identifierWithNodeScope.literal;
|
|
69
|
-
if (!nodeScope.has(literal) &&
|
|
69
|
+
if (!nodeScope.scopeItemByKey.has(literal) &&
|
|
70
70
|
!__1.LibraryUtils.hasDefinition(validationSettings.library, literal) &&
|
|
71
71
|
!validationSettings.library.externalTypeResolver({
|
|
72
72
|
kind: externalType_1.ExternalTypeRequestKind.Value,
|
|
73
73
|
identifierLiteral: literal,
|
|
74
74
|
})) {
|
|
75
75
|
const knownIdentifiers = [
|
|
76
|
-
...nodeScope.keys(),
|
|
76
|
+
...nodeScope.scopeItemByKey.keys(),
|
|
77
77
|
...__1.LibraryUtils.getDefinitionKeys(validationSettings.library),
|
|
78
78
|
];
|
|
79
79
|
const [jaroWinklerScore, suggestion] = (0, jaroWinkler_1.calculateJaroWinklers)(literal, knownIdentifiers);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateUnknownIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateUnknownIdentifiers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"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/validationSettings.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { InspectionSettings } from "../../inspectionSettings";
|
|
|
3
3
|
import { Library } from "../../library";
|
|
4
4
|
export interface ValidationSettings extends InspectionSettings {
|
|
5
5
|
readonly cancellationToken: ICancellationToken | undefined;
|
|
6
|
+
readonly checkDiagnosticsOnParseError: boolean;
|
|
6
7
|
readonly checkForDuplicateIdentifiers: boolean;
|
|
7
8
|
readonly checkInvokeExpressions: boolean;
|
|
8
9
|
readonly checkUnknownIdentifiers: boolean;
|
package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js
CHANGED
|
@@ -6,6 +6,7 @@ exports.createValidationSettings = createValidationSettings;
|
|
|
6
6
|
function createValidationSettings(inspectionSettings, source, overrides) {
|
|
7
7
|
return {
|
|
8
8
|
...inspectionSettings,
|
|
9
|
+
checkDiagnosticsOnParseError: overrides?.checkDiagnosticsOnParseError ?? true,
|
|
9
10
|
checkForDuplicateIdentifiers: overrides?.checkForDuplicateIdentifiers ?? true,
|
|
10
11
|
checkInvokeExpressions: overrides?.checkInvokeExpressions ?? true,
|
|
11
12
|
checkUnknownIdentifiers: overrides?.checkUnknownIdentifiers ?? true,
|
package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validationSettingsUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/validate/validationSettings/validationSettingsUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAKlC,
|
|
1
|
+
{"version":3,"file":"validationSettingsUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/validate/validationSettings/validationSettingsUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAKlC,4DAcC;AAdD,SAAgB,wBAAwB,CACpC,kBAAsC,EACtC,MAAc,EACd,SAAuC;IAEvC,OAAO;QACH,GAAG,kBAAkB;QACrB,4BAA4B,EAAE,SAAS,EAAE,4BAA4B,IAAI,IAAI;QAC7E,4BAA4B,EAAE,SAAS,EAAE,4BAA4B,IAAI,IAAI;QAC7E,sBAAsB,EAAE,SAAS,EAAE,sBAAsB,IAAI,IAAI;QACjE,uBAAuB,EAAE,SAAS,EAAE,uBAAuB,IAAI,IAAI;QACnE,OAAO,EAAE,kBAAkB,CAAC,OAAO;QACnC,MAAM;KACT,CAAC;AACN,CAAC"}
|