@microsoft/powerquery-language-services 0.3.9 → 0.3.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/powerquery-language-services/analysis/analysisBase.js +25 -14
- package/lib/powerquery-language-services/analysis/analysisBase.js.map +1 -1
- package/lib/powerquery-language-services/inspection/commonTypes.d.ts +3 -1
- package/lib/powerquery-language-services/inspection/task.d.ts +21 -0
- package/lib/powerquery-language-services/inspection/task.js +22 -14
- package/lib/powerquery-language-services/inspection/task.js.map +1 -1
- package/package.json +5 -2
|
@@ -105,19 +105,18 @@ class AnalysisBase {
|
|
|
105
105
|
const maybeInspected = yield this.promiseMaybeInspected;
|
|
106
106
|
const activeNode = yield this.getMaybeActiveNode();
|
|
107
107
|
const scopeById = maybeInspected === null || maybeInspected === void 0 ? void 0 : maybeInspected.typeCache.scopeById;
|
|
108
|
-
const
|
|
109
|
-
if (maybeInspected === undefined ||
|
|
108
|
+
const maybeInclusiveIdentifierUnderPosition = activeNode === null || activeNode === void 0 ? void 0 : activeNode.maybeInclusiveIdentifierUnderPosition;
|
|
109
|
+
if (maybeInspected === undefined || maybeInclusiveIdentifierUnderPosition === undefined) {
|
|
110
110
|
return [];
|
|
111
111
|
}
|
|
112
112
|
const identifiersToBeEdited = [];
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
113
|
+
let valueCreator = undefined;
|
|
114
|
+
if (maybeInclusiveIdentifierUnderPosition.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
|
|
115
|
+
valueCreator = maybeInclusiveIdentifierUnderPosition;
|
|
116
116
|
}
|
|
117
|
-
else if (
|
|
117
|
+
else if (maybeInclusiveIdentifierUnderPosition.kind === "Identifier" /* Identifier */ && scopeById) {
|
|
118
118
|
// need to find this key value and modify all referring it
|
|
119
|
-
const theIdentifierNode =
|
|
120
|
-
let valueCreator = undefined;
|
|
119
|
+
const theIdentifierNode = maybeInclusiveIdentifierUnderPosition;
|
|
121
120
|
switch (theIdentifierNode.identifierContextKind) {
|
|
122
121
|
case "Key" /* Key */:
|
|
123
122
|
case "Parameter" /* Parameter */:
|
|
@@ -126,8 +125,13 @@ class AnalysisBase {
|
|
|
126
125
|
break;
|
|
127
126
|
case "Value" /* Value */: {
|
|
128
127
|
// it is the identifier referring the value
|
|
129
|
-
|
|
130
|
-
|
|
128
|
+
let nodeScope = maybeInspected.typeCache.scopeById.get(theIdentifierNode.id);
|
|
129
|
+
// there might be a chance that its scope did not get populated yet, do another try
|
|
130
|
+
if (!nodeScope) {
|
|
131
|
+
yield maybeInspected.tryNodeScope(theIdentifierNode.id);
|
|
132
|
+
nodeScope = maybeInspected.typeCache.scopeById.get(theIdentifierNode.id);
|
|
133
|
+
}
|
|
134
|
+
const scopeItem = (0, scopeUtils_1.findScopeItemByLiteral)(nodeScope, maybeInclusiveIdentifierUnderPosition.literal);
|
|
131
135
|
if (scopeItem) {
|
|
132
136
|
const maybeValueCreator = (0, scopeUtils_1.findTheCreatorIdentifierOfOneScopeItem)(scopeItem);
|
|
133
137
|
if ((maybeValueCreator === null || maybeValueCreator === void 0 ? void 0 : maybeValueCreator.kind) === "Identifier" /* Identifier */) {
|
|
@@ -139,6 +143,9 @@ class AnalysisBase {
|
|
|
139
143
|
identifiersToBeEdited.push(maybeValueCreator);
|
|
140
144
|
}
|
|
141
145
|
}
|
|
146
|
+
else if ((maybeValueCreator === null || maybeValueCreator === void 0 ? void 0 : maybeValueCreator.kind) === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
|
|
147
|
+
valueCreator = maybeValueCreator;
|
|
148
|
+
}
|
|
142
149
|
else if (maybeValueCreator) {
|
|
143
150
|
identifiersToBeEdited.push(maybeValueCreator);
|
|
144
151
|
}
|
|
@@ -151,10 +158,14 @@ class AnalysisBase {
|
|
|
151
158
|
identifiersToBeEdited.push(theIdentifierNode);
|
|
152
159
|
break;
|
|
153
160
|
}
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
161
|
+
}
|
|
162
|
+
if (valueCreator) {
|
|
163
|
+
// need to populate the other identifiers referring it
|
|
164
|
+
identifiersToBeEdited.push(...(yield maybeInspected.collectAllIdentifiersBeneath(valueCreator)));
|
|
165
|
+
}
|
|
166
|
+
// if none found, directly put maybeInclusiveIdentifierUnderPosition in if it exists
|
|
167
|
+
if (identifiersToBeEdited.length === 0 && maybeInclusiveIdentifierUnderPosition) {
|
|
168
|
+
identifiersToBeEdited.push(maybeInclusiveIdentifierUnderPosition);
|
|
158
169
|
}
|
|
159
170
|
return identifiersToBeEdited.map((one) => ({
|
|
160
171
|
range: PositionUtils.createRangeFromTokenRange(one.tokenRange),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAGlC,oEAAsD;AAItD,sDAAsD;AACtD,kDAAkD;AAClD,8CAAwE;AAUxE,0BAAkD;AAClD,gDAAgE;AAChE,+DAAgH;AAChH,4CAAoH;AAKpH,MAAsB,YAAY;IAK9B,YACc,gBAAkC,EAClC,qBAAgE;QADhE,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,0BAAqB,GAArB,qBAAqB,CAA2C;QAE1E,MAAM,OAAO,GAAqB,gBAAgB,CAAC,OAAO,CAAC;QAE3D,IAAI,CAAC,gCAAgC;YACjC,gBAAgB,CAAC,6CAA6C,KAAK,SAAS;gBACxE,CAAC,CAAC,gBAAgB,CAAC,6CAA6C,EAAE;gBAClE,CAAC,CAAC,IAAI,4CAAgC,CAAC,qBAAqB,CAAC,CAAC;QAEtE,IAAI,CAAC,qBAAqB;YACtB,gBAAgB,CAAC,kCAAkC,KAAK,SAAS;gBAC7D,CAAC,CAAC,gBAAgB,CAAC,kCAAkC,CAAC,OAAO,CAAC;gBAC9D,CAAC,CAAC,IAAI,iCAAqB,CAAC,OAAO,CAAC,CAAC;QAE7C,IAAI,CAAC,2BAA2B;YAC5B,gBAAgB,CAAC,wCAAwC,KAAK,SAAS;gBACnE,CAAC,CAAC,gBAAgB,CAAC,wCAAwC,CACrD,OAAO,EACP,qBAAqB,EACrB,gBAAgB,CAAC,0BAA0B,CAC9C;gBACH,CAAC,CAAC,IAAI,uCAA2B,CAC3B,OAAO,EACP,qBAAqB,EACrB,gBAAgB,CAAC,0BAA0B,CAC9C,CAAC;IAChB,CAAC;IAEY,oBAAoB;;YAC7B,IAAI,OAAO,GAAoC,EAAE,CAAC;YAElD,MAAM,UAAU,GACZ,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAE5C,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC1B,OAAO,GAAG;oBACN,KAAK,EAAE,oBAAgB,CAAC,mBAAmB,CAAC,UAAU,CAAC,UAAU,CAAC;oBAClE,IAAI,EAAE,UAAU,CAAC,OAAO;oBACxB,SAAS,EAAE,UAAU,CAAC,IAAI;iBAC7B,CAAC;aACL;YAED,kCAAkC;YAClC,6BAA6B;YAC7B,4CAA4C;YAC5C,MAAM,CAAC,gBAAgB,EAAE,eAAe,EAAE,qBAAqB,CAAC,GAE5D,MAAM,OAAO,CAAC,GAAG,CACjB,YAAY,CAAC,2BAA2B,CACpC,OAAO,EACP,CAAC,IAAI,CAAC,gCAAgC,EAAE,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,2BAA2B,CAAC,EACrG,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAClD,CACJ,CAAC;YAEF,MAAM,OAAO,GAAuB,EAAE,CAAC;YAEvC,KAAK,MAAM,UAAU,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE;gBACjF,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;oBAC3B,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,WAA6B,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE;wBACjG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBACtB;iBACJ;aACJ;YAED,OAAO,OAAO,CAAC,IAAI,CAAC,kCAAqB,CAAC,SAAS,CAAC,CAAC;QACzD,CAAC;KAAA;IAEY,QAAQ;;YACjB,MAAM,eAAe,GAAsC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAE3F,MAAM,4BAA4B,GAC9B,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,qCAAqC,CAAC;YAE3D,IACI,eAAe,KAAK,SAAS;gBAC7B,4BAA4B,KAAK,SAAS;gBAC1C,CAAC,YAAY,CAAC,sBAAsB,CAAC,eAAe,CAAC,EACvD;gBACE,OAAO,wBAAU,CAAC;aACrB;YAED,MAAM,UAAU,GAA+C,4BAA4B,CAAC;YAE5F,MAAM,OAAO,GAAyB;gBAClC,KAAK,EAAE,oBAAgB,CAAC,mBAAmB,CAAC,UAAU,CAAC,UAAU,CAAC;gBAClE,UAAU,EAAE,UAAU,CAAC,OAAO;aACjC,CAAC;YAEF,gEAAgE;YAChE,OAAO,YAAY,CAAC,gBAAgB,CAChC,YAAY,CAAC,gBAAgB,CACzB,OAAO,EACP,CAAC,IAAI,CAAC,2BAA2B,EAAE,IAAI,CAAC,qBAAqB,CAAC,EAC9D,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAClD,EACD,wBAAU,CACb,CAAC;QACN,CAAC;KAAA;IAEY,gBAAgB;;YACzB,MAAM,cAAc,GAAqC,MAAM,IAAI,CAAC,qBAAqB,CAAC;YAE1F,IAAI,cAAc,KAAK,SAAS,EAAE;gBAC9B,OAAO,gCAAkB,CAAC;aAC7B;YAED,MAAM,YAAY,GACd,MAAM,eAAe,CAAC,mCAAmC,CAAC,cAAc,CAAC,CAAC;YAE9E,IAAI,YAAY,KAAK,SAAS,EAAE;gBAC5B,OAAO,gCAAkB,CAAC;aAC7B;YAED,MAAM,OAAO,GAA6B,YAAY,CAAC;YAEvD,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;gBACpC,OAAO,gCAAkB,CAAC;aAC7B;YAED,gEAAgE;YAChE,OAAO,YAAY,CAAC,gBAAgB,CAChC,YAAY,CAAC,wBAAwB,CACjC,OAAO,EACP,CAAC,IAAI,CAAC,2BAA2B,EAAE,IAAI,CAAC,qBAAqB,CAAC,EAC9D,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAClD,EACD,gCAAkB,CACrB,CAAC;QACN,CAAC;KAAA;IAEY,cAAc,CAAC,OAAe;;YACvC,MAAM,cAAc,GAAqC,MAAM,IAAI,CAAC,qBAAqB,CAAC;YAC1F,MAAM,UAAU,GAAsC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACtF,MAAM,SAAS,GAAqC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,SAAS,CAAC,SAAS,CAAC;YAExF,MAAM,
|
|
1
|
+
{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language
|
|
|
3
3
|
import { Inspection } from "..";
|
|
4
4
|
import { TMaybeActiveNode } from "./activeNode";
|
|
5
5
|
import { TriedExpectedType } from "./expectedType";
|
|
6
|
+
import { TriedNodeScope } from "./scope";
|
|
6
7
|
import { TypeCache } from "./typeCache";
|
|
7
8
|
export declare type TriedInspection = PQP.Result<Inspected, PQP.CommonError.CommonError>;
|
|
8
9
|
export interface Inspected {
|
|
@@ -14,5 +15,6 @@ export interface Inspected {
|
|
|
14
15
|
readonly triedExpectedType: TriedExpectedType;
|
|
15
16
|
readonly typeCache: TypeCache;
|
|
16
17
|
readonly parseState: PQP.Parser.ParseState;
|
|
17
|
-
readonly
|
|
18
|
+
readonly tryNodeScope: (id: number) => Promise<TriedNodeScope>;
|
|
19
|
+
readonly collectAllIdentifiersBeneath: (entryNodeId: Ast.Identifier | Ast.GeneralizedIdentifier) => Promise<Array<Ast.Identifier | Ast.GeneralizedIdentifier>>;
|
|
18
20
|
}
|
|
@@ -1,7 +1,28 @@
|
|
|
1
1
|
import * as PQP from "@microsoft/powerquery-parser";
|
|
2
|
+
import { NodeIdMap } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
|
+
import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
4
|
import type { Position } from "vscode-languageserver-types";
|
|
5
|
+
import { TMaybeActiveNode } from "./activeNode";
|
|
6
|
+
import { TriedNodeScope } from "./scope";
|
|
7
|
+
import { TriedExpectedType } from "./expectedType";
|
|
3
8
|
import { TypeCache } from "./typeCache";
|
|
4
9
|
import { Inspected } from "./commonTypes";
|
|
10
|
+
import { Inspection } from "..";
|
|
5
11
|
import { InspectionSettings } from "../inspectionSettings";
|
|
12
|
+
export declare class InspectionInstance implements Inspected {
|
|
13
|
+
readonly settings: InspectionSettings;
|
|
14
|
+
readonly nodeIdMapCollection: NodeIdMap.Collection;
|
|
15
|
+
readonly maybeActiveNode: TMaybeActiveNode;
|
|
16
|
+
readonly autocomplete: Inspection.Autocomplete;
|
|
17
|
+
readonly triedCurrentInvokeExpression: Promise<Inspection.TriedCurrentInvokeExpression>;
|
|
18
|
+
readonly triedNodeScope: Promise<Inspection.TriedNodeScope>;
|
|
19
|
+
readonly triedScopeType: Promise<Inspection.TriedScopeType>;
|
|
20
|
+
readonly triedExpectedType: TriedExpectedType;
|
|
21
|
+
readonly typeCache: TypeCache;
|
|
22
|
+
readonly parseState: PQP.Parser.ParseState;
|
|
23
|
+
constructor(settings: InspectionSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeActiveNode: TMaybeActiveNode, autocomplete: Inspection.Autocomplete, triedCurrentInvokeExpression: Promise<Inspection.TriedCurrentInvokeExpression>, triedNodeScope: Promise<Inspection.TriedNodeScope>, triedScopeType: Promise<Inspection.TriedScopeType>, triedExpectedType: TriedExpectedType, typeCache: TypeCache, parseState: PQP.Parser.ParseState);
|
|
24
|
+
tryNodeScope(id: number): Promise<TriedNodeScope>;
|
|
25
|
+
collectAllIdentifiersBeneath(valueCreator: Ast.Identifier | Ast.GeneralizedIdentifier): Promise<Array<Ast.Identifier | Ast.GeneralizedIdentifier>>;
|
|
26
|
+
}
|
|
6
27
|
export declare function inspect(settings: InspectionSettings, parseState: PQP.Parser.ParseState, maybeParseError: PQP.Parser.ParseError.ParseError | undefined, position: Position, typeCache?: TypeCache): Promise<Inspected>;
|
|
7
28
|
export declare function tryInspect(settings: InspectionSettings, text: string, position: Position, typeCache?: TypeCache): Promise<PQP.Result<Promise<Inspected>, PQP.Lexer.LexError.TLexError | PQP.Parser.ParseError.TParseError>>;
|
|
@@ -11,12 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
});
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.tryInspect = exports.inspect = void 0;
|
|
14
|
+
exports.tryInspect = exports.inspect = exports.InspectionInstance = void 0;
|
|
15
15
|
const PQP = require("@microsoft/powerquery-parser");
|
|
16
16
|
const activeNode_1 = require("./activeNode");
|
|
17
|
+
const scope_1 = require("./scope");
|
|
17
18
|
const scopeUtils_1 = require("./scope/scopeUtils");
|
|
18
19
|
const expectedType_1 = require("./expectedType");
|
|
19
|
-
const scope_1 = require("./scope");
|
|
20
20
|
const type_1 = require("./type");
|
|
21
21
|
const typeCache_1 = require("./typeCache");
|
|
22
22
|
const autocomplete_1 = require("./autocomplete");
|
|
@@ -34,47 +34,54 @@ class InspectionInstance {
|
|
|
34
34
|
this.typeCache = typeCache;
|
|
35
35
|
this.parseState = parseState;
|
|
36
36
|
}
|
|
37
|
+
tryNodeScope(id) {
|
|
38
|
+
return (0, scope_1.tryNodeScope)(this.settings, this.nodeIdMapCollection, id, this.typeCache.scopeById);
|
|
39
|
+
}
|
|
37
40
|
collectAllIdentifiersBeneath(valueCreator) {
|
|
41
|
+
var _a, _b, _c, _d, _e;
|
|
38
42
|
return __awaiter(this, void 0, void 0, function* () {
|
|
39
43
|
const astNodeById = this.nodeIdMapCollection.astNodeById;
|
|
40
44
|
const childIdsById = this.nodeIdMapCollection.childIdsById;
|
|
41
45
|
const originLiteral = valueCreator.literal;
|
|
42
46
|
const entry = (0, scopeUtils_1.findDirectUpperScopeExpression)(this.nodeIdMapCollection, valueCreator.id);
|
|
43
47
|
if (entry) {
|
|
44
|
-
const allIdentifierIdSet = this.nodeIdMapCollection.idsByNodeKind.get("Identifier" /* Identifier */)
|
|
48
|
+
const allIdentifierIdSet = (_a = this.nodeIdMapCollection.idsByNodeKind.get("Identifier" /* Identifier */)) !== null && _a !== void 0 ? _a : new Set();
|
|
49
|
+
const allGeneralizedIdentifierIdSet = (_b = this.nodeIdMapCollection.idsByNodeKind.get("GeneralizedIdentifier" /* GeneralizedIdentifier */)) !== null && _b !== void 0 ? _b : new Set();
|
|
45
50
|
const current = entry;
|
|
46
51
|
const idsByTiers = [];
|
|
47
|
-
let currentTier = (childIdsById.get(current.id)
|
|
52
|
+
let currentTier = ((_c = childIdsById.get(current.id)) !== null && _c !== void 0 ? _c : []).slice();
|
|
48
53
|
while (currentTier.length) {
|
|
49
|
-
const toBePushed = currentTier.filter((one) => allIdentifierIdSet.has(one));
|
|
54
|
+
const toBePushed = currentTier.filter((one) => allIdentifierIdSet.has(one) || allGeneralizedIdentifierIdSet.has(one));
|
|
50
55
|
toBePushed.length && idsByTiers.push(toBePushed);
|
|
51
56
|
currentTier = currentTier.slice();
|
|
52
57
|
let nextTier = [];
|
|
53
58
|
while (currentTier.length) {
|
|
54
|
-
const oneNode = currentTier.shift()
|
|
55
|
-
const childrenOfTheNode = (childIdsById.get(oneNode)
|
|
59
|
+
const oneNode = (_d = currentTier.shift()) !== null && _d !== void 0 ? _d : -1;
|
|
60
|
+
const childrenOfTheNode = ((_e = childIdsById.get(oneNode)) !== null && _e !== void 0 ? _e : []).slice();
|
|
56
61
|
nextTier = nextTier.concat(childrenOfTheNode);
|
|
57
62
|
}
|
|
58
63
|
currentTier = nextTier;
|
|
59
64
|
}
|
|
60
65
|
// filter literal names
|
|
61
66
|
const completeIdentifierNodes = idsByTiers
|
|
62
|
-
.
|
|
67
|
+
.flat(1)
|
|
63
68
|
.map((one) => astNodeById.get(one))
|
|
64
69
|
.filter(Boolean);
|
|
65
70
|
let filteredIdentifierNodes = completeIdentifierNodes.filter((one) => one.literal === originLiteral);
|
|
66
71
|
// populate the scope items for each
|
|
67
72
|
yield Promise.all(filteredIdentifierNodes
|
|
68
|
-
.filter((oneIdentifier) => oneIdentifier.
|
|
69
|
-
.
|
|
73
|
+
.filter((oneIdentifier) => oneIdentifier.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */ ||
|
|
74
|
+
oneIdentifier.identifierContextKind === "Value" /* Value */)
|
|
75
|
+
.map((oneIdentifier) => this.tryNodeScope(oneIdentifier.id)));
|
|
70
76
|
filteredIdentifierNodes = filteredIdentifierNodes.filter((oneIdentifierNode) => {
|
|
71
|
-
if (oneIdentifierNode.
|
|
77
|
+
if (oneIdentifierNode.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
|
|
78
|
+
return oneIdentifierNode.id === valueCreator.id;
|
|
79
|
+
}
|
|
80
|
+
else if (oneIdentifierNode.identifierContextKind === "Value" /* Value */) {
|
|
72
81
|
const theScope = this.typeCache.scopeById.get(oneIdentifierNode.id);
|
|
73
82
|
const theScopeItem = (0, scopeUtils_1.findScopeItemByLiteral)(theScope, originLiteral);
|
|
74
83
|
const theCreatorIdentifier = (0, scopeUtils_1.findTheCreatorIdentifierOfOneScopeItem)(theScopeItem);
|
|
75
|
-
return
|
|
76
|
-
theCreatorIdentifier.kind === "Identifier" /* Identifier */ &&
|
|
77
|
-
theCreatorIdentifier.id === valueCreator.id);
|
|
84
|
+
return theCreatorIdentifier && theCreatorIdentifier.id === valueCreator.id;
|
|
78
85
|
}
|
|
79
86
|
else if (oneIdentifierNode.identifierContextKind === "Key" /* Key */ ||
|
|
80
87
|
oneIdentifierNode.identifierContextKind === "Parameter" /* Parameter */) {
|
|
@@ -88,6 +95,7 @@ class InspectionInstance {
|
|
|
88
95
|
});
|
|
89
96
|
}
|
|
90
97
|
}
|
|
98
|
+
exports.InspectionInstance = InspectionInstance;
|
|
91
99
|
function inspect(settings, parseState, maybeParseError, position,
|
|
92
100
|
// If a TypeCache is given, then potentially add to its values and include it as part of the return,
|
|
93
101
|
// Else create a new TypeCache and include it in the return.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAKpD,6CAA6E;AAK7E,mDAI4B;
|
|
1
|
+
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/task.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/powerquery-language-services",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.10",
|
|
4
4
|
"author": "Microsoft",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"scripts": {
|
|
7
|
-
"prepublishOnly": "git clean -xdf && npm install && npm run lint && npm run build && npm run test",
|
|
7
|
+
"prepublishOnly": "git clean -xdf && npm install-clean && npm run lint && npm run build && npm run test",
|
|
8
8
|
"build": ".\\node_modules\\.bin\\tsc",
|
|
9
9
|
"watch": ".\\node_modules\\.bin\\tsc -b -watch",
|
|
10
10
|
"lint": "eslint src --ext ts",
|
|
@@ -21,6 +21,9 @@
|
|
|
21
21
|
"description": "Language services for the Power Query/M formula language.",
|
|
22
22
|
"main": "lib/powerquery-language-services/index.js",
|
|
23
23
|
"types": "lib/powerquery-language-services/index.d.ts",
|
|
24
|
+
"engines": {
|
|
25
|
+
"node": ">=16.13.2"
|
|
26
|
+
},
|
|
24
27
|
"keywords": [
|
|
25
28
|
"power query",
|
|
26
29
|
"power bi"
|