@microsoft/powerquery-language-services 0.3.13 → 0.3.14
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/analysisSettings.d.ts +1 -1
- package/lib/powerquery-language-services/analysis/documentAnalysis.js +1 -1
- package/lib/powerquery-language-services/analysis/documentAnalysis.js.map +1 -1
- package/lib/powerquery-language-services/documentSymbols.d.ts +1 -1
- package/lib/powerquery-language-services/documentSymbols.js +3 -5
- package/lib/powerquery-language-services/documentSymbols.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/task.js +2 -0
- package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
- package/lib/powerquery-language-services/inspectionSettings.d.ts +1 -0
- package/lib/powerquery-language-services/inspectionUtils.d.ts +1 -1
- package/lib/powerquery-language-services/inspectionUtils.js +3 -2
- package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
- package/lib/powerquery-language-services/validate/validate.js +2 -2
- package/lib/powerquery-language-services/validate/validate.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js +1 -1
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateLexAndParse.js +2 -2
- package/lib/powerquery-language-services/validate/validateLexAndParse.js.map +1 -1
- package/lib/powerquery-language-services/validate/validationSettings/validationSettings.d.ts +1 -0
- package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.d.ts +4 -4
- package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.js +24 -14
- package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,8 +4,8 @@ import { Inspection } from "..";
|
|
|
4
4
|
import { InspectionSettings } from "../inspectionSettings";
|
|
5
5
|
export interface AnalysisSettings {
|
|
6
6
|
readonly createInspectionSettingsFn: () => InspectionSettings;
|
|
7
|
+
readonly isWorkspaceCacheAllowed: boolean;
|
|
7
8
|
readonly library: ILibrary;
|
|
8
|
-
readonly maintainWorkspaceCache?: boolean;
|
|
9
9
|
readonly maybeCreateLanguageAutocompleteItemProviderFn?: () => AutocompleteItemProvider;
|
|
10
10
|
readonly maybeCreateLibrarySymbolProviderFn?: (library: ILibrary) => ISymbolProvider;
|
|
11
11
|
readonly maybeCreateLocalDocumentSymbolProviderFn?: (library: ILibrary, promiseMaybeInspected: Promise<Inspection.Inspected | undefined>, createInspectionSettingsFn: () => InspectionSettings) => ISymbolProvider;
|
|
@@ -11,7 +11,7 @@ class DocumentAnalysis extends analysisBase_1.AnalysisBase {
|
|
|
11
11
|
this.textDocument = textDocument;
|
|
12
12
|
}
|
|
13
13
|
dispose() {
|
|
14
|
-
if (!this.analysisSettings.
|
|
14
|
+
if (!this.analysisSettings.isWorkspaceCacheAllowed) {
|
|
15
15
|
workspaceCache_1.WorkspaceCacheUtils.close(this.textDocument);
|
|
16
16
|
}
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"documentAnalysis.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/documentAnalysis.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,iDAA8C;AAE9C,sDAAwD;AAExD,MAAa,gBAAiB,SAAQ,2BAAY;IAC9C,YAA6B,YAA0B,EAAE,gBAAkC,EAAE,QAAkB;QAC3G,KAAK,CACD,gBAAgB,EAChB,oCAAmB,CAAC,2BAA2B,CAC3C,YAAY,EACZ,gBAAgB,CAAC,0BAA0B,EAAE,EAC7C,QAAQ,CACX,CACJ,CAAC;QARuB,iBAAY,GAAZ,YAAY,CAAc;IASvD,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"documentAnalysis.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/documentAnalysis.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,iDAA8C;AAE9C,sDAAwD;AAExD,MAAa,gBAAiB,SAAQ,2BAAY;IAC9C,YAA6B,YAA0B,EAAE,gBAAkC,EAAE,QAAkB;QAC3G,KAAK,CACD,gBAAgB,EAChB,oCAAmB,CAAC,2BAA2B,CAC3C,YAAY,EACZ,gBAAgB,CAAC,0BAA0B,EAAE,EAC7C,QAAQ,CACX,CACJ,CAAC;QARuB,iBAAY,GAAZ,YAAY,CAAc;IASvD,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,EAAE;YAChD,oCAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAChD;IACL,CAAC;IAES,OAAO,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;CACJ;AArBD,4CAqBC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import * as PQP from "@microsoft/powerquery-parser";
|
|
2
2
|
import { DocumentSymbol, TextDocument } from "./commonTypes";
|
|
3
|
-
export declare function getDocumentSymbols(textDocument: TextDocument, lexAndParseSettings: PQP.LexSettings & PQP.ParseSettings,
|
|
3
|
+
export declare function getDocumentSymbols(textDocument: TextDocument, lexAndParseSettings: PQP.LexSettings & PQP.ParseSettings, isWorkspaceCacheAllowed: boolean): Promise<DocumentSymbol[]>;
|
|
@@ -17,9 +17,9 @@ const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/par
|
|
|
17
17
|
const InspectionUtils = require("./inspectionUtils");
|
|
18
18
|
const commonTypes_1 = require("./commonTypes");
|
|
19
19
|
const workspaceCache_1 = require("./workspaceCache");
|
|
20
|
-
function getDocumentSymbols(textDocument, lexAndParseSettings,
|
|
20
|
+
function getDocumentSymbols(textDocument, lexAndParseSettings, isWorkspaceCacheAllowed) {
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const maybeTriedParse = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, lexAndParseSettings);
|
|
22
|
+
const maybeTriedParse = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, lexAndParseSettings, isWorkspaceCacheAllowed);
|
|
23
23
|
if (maybeTriedParse === undefined || PQP.TaskUtils.isParseStageCommonError(maybeTriedParse)) {
|
|
24
24
|
return [];
|
|
25
25
|
}
|
|
@@ -28,9 +28,7 @@ function getDocumentSymbols(textDocument, lexAndParseSettings, maintainWorkspace
|
|
|
28
28
|
const parentSymbolById = new Map();
|
|
29
29
|
addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById);
|
|
30
30
|
addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById);
|
|
31
|
-
|
|
32
|
-
workspaceCache_1.WorkspaceCacheUtils.close(textDocument);
|
|
33
|
-
}
|
|
31
|
+
workspaceCache_1.WorkspaceCacheUtils.close(textDocument);
|
|
34
32
|
return currentSymbols;
|
|
35
33
|
});
|
|
36
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../src/powerquery-language-services/documentSymbols.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,sFAKmE;AAGnE,qDAAqD;AACrD,+CAAyE;AACzE,qDAAuD;AAEvD,SAAsB,kBAAkB,CACpC,YAA0B,EAC1B,mBAAwD,EACxD,
|
|
1
|
+
{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../src/powerquery-language-services/documentSymbols.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,7 @@ typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
|
|
|
25
25
|
const trace = settings.traceManager.entry("Inspection.ScopeType" /* InspectScopeType */, tryScopeType.name, settings.maybeInitialCorrelationId);
|
|
26
26
|
const state = {
|
|
27
27
|
locale: settings.locale,
|
|
28
|
+
isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
|
|
28
29
|
maybeCancellationToken: settings.maybeCancellationToken,
|
|
29
30
|
maybeEachScopeById: settings.maybeEachScopeById,
|
|
30
31
|
maybeExternalTypeResolver: settings.maybeExternalTypeResolver,
|
|
@@ -46,6 +47,7 @@ function tryType(settings, nodeIdMapCollection, nodeId, typeCache = typeCache_1.
|
|
|
46
47
|
const trace = settings.traceManager.entry("Inspection.Type" /* InspectType */, tryType.name, settings.maybeInitialCorrelationId);
|
|
47
48
|
const state = {
|
|
48
49
|
locale: settings.locale,
|
|
50
|
+
isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
|
|
49
51
|
maybeCancellationToken: settings.maybeCancellationToken,
|
|
50
52
|
maybeEachScopeById: settings.maybeEachScopeById,
|
|
51
53
|
maybeExternalTypeResolver: settings.maybeExternalTypeResolver,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAGlC,oEAAmE;AACnE,sFAAsG;AAItG,+CAAmH;AAGnH,4CAAyD;AAMzD,yCAAyC;AACzC,SAAsB,YAAY,CAC9B,QAA4B,EAC5B,mBAAyC,EACzC,MAAc;AACd,oGAAoG;AACpG,4DAA4D;AAC5D,YAAuB,0BAAc,CAAC,gBAAgB,EAAE;;QAExD,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,gDAE5C,YAAY,CAAC,IAAI,EACjB,QAAQ,CAAC,yBAAyB,CACrC,CAAC;QAEF,MAAM,KAAK,GAAqB;YAC5B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,sBAAsB,EAAE,QAAQ,CAAC,sBAAsB;YACvD,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;YAC/C,yBAAyB,EAAE,QAAQ,CAAC,yBAAyB;YAC7D,yBAAyB,EAAE,KAAK,CAAC,EAAE;YACnC,YAAY,EAAE,QAAQ,CAAC,YAAY;YACnC,aAAa,EAAE,SAAS,CAAC,QAAQ;YACjC,aAAa,EAAE,IAAI,GAAG,EAAE;YACxB,mBAAmB;YACnB,SAAS,EAAE,SAAS,CAAC,SAAS;SACjC,CAAC;QAEF,MAAM,MAAM,GAA4B,+BAAW,CAAC,iBAAiB,CACjE,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,EAC/C,QAAQ,CAAC,MAAM,CAClB,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import * as PQP from "@microsoft/powerquery-parser";
|
|
|
2
2
|
import { ExternalType } from "./inspection/externalType";
|
|
3
3
|
import { TypeById } from "./inspection";
|
|
4
4
|
export interface InspectionSettings extends PQP.Settings {
|
|
5
|
+
readonly isWorkspaceCacheAllowed: boolean;
|
|
5
6
|
readonly maybeEachScopeById: TypeById | undefined;
|
|
6
7
|
readonly maybeExternalTypeResolver: ExternalType.TExternalTypeResolverFn | undefined;
|
|
7
8
|
}
|
|
@@ -6,7 +6,7 @@ import { Inspection } from ".";
|
|
|
6
6
|
import { ExternalType } from "./inspection/externalType";
|
|
7
7
|
import { InspectionSettings } from "./inspectionSettings";
|
|
8
8
|
import { TypeById } from "./inspection";
|
|
9
|
-
export declare function createInspectionSettings(settings: PQP.Settings, maybeEachScopeById: TypeById | undefined, maybeExternalTypeResolver: ExternalType.TExternalTypeResolverFn | undefined): InspectionSettings;
|
|
9
|
+
export declare function createInspectionSettings(settings: PQP.Settings, maybeEachScopeById: TypeById | undefined, maybeExternalTypeResolver: ExternalType.TExternalTypeResolverFn | undefined, isWorkspaceCacheAllowed: boolean): InspectionSettings;
|
|
10
10
|
export declare function getMaybeContextForSignatureProvider(inspected: Inspection.Inspected): Promise<SignatureProviderContext | undefined>;
|
|
11
11
|
export declare function getMaybeSignatureHelp(context: SignatureProviderContext): SignatureHelp | null;
|
|
12
12
|
export declare function getMaybeType(inspected: Inspection.Inspected, identifier: string): Promise<Type.TPowerQueryType | undefined>;
|
|
@@ -17,9 +17,10 @@ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/l
|
|
|
17
17
|
const vscode_languageserver_types_1 = require("vscode-languageserver-types");
|
|
18
18
|
const _1 = require(".");
|
|
19
19
|
const autocomplete_1 = require("./inspection/autocomplete");
|
|
20
|
-
function createInspectionSettings(settings, maybeEachScopeById, maybeExternalTypeResolver) {
|
|
20
|
+
function createInspectionSettings(settings, maybeEachScopeById, maybeExternalTypeResolver, isWorkspaceCacheAllowed) {
|
|
21
21
|
return Object.assign(Object.assign({}, settings), { maybeEachScopeById,
|
|
22
|
-
maybeExternalTypeResolver
|
|
22
|
+
maybeExternalTypeResolver,
|
|
23
|
+
isWorkspaceCacheAllowed });
|
|
23
24
|
}
|
|
24
25
|
exports.createInspectionSettings = createInspectionSettings;
|
|
25
26
|
function getMaybeContextForSignatureProvider(inspected) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAIlC,oEAAmE;AACnE,0FAAmG;AACnG,6EAAwF;AAGxF,wBAA8C;AAC9C,4DAAkE;AAKlE,SAAgB,wBAAwB,CACpC,QAAsB,EACtB,kBAAwC,EACxC,yBAA2E;
|
|
1
|
+
{"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ function validate(textDocument, validationSettings) {
|
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
23
|
const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validate.name, validationSettings.maybeInitialCorrelationId);
|
|
24
24
|
const updatedSettings = Object.assign(Object.assign({}, validationSettings), { maybeInitialCorrelationId: trace.id });
|
|
25
|
-
const maybeTriedParse = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, updatedSettings);
|
|
25
|
+
const maybeTriedParse = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, updatedSettings, updatedSettings.isWorkspaceCacheAllowed);
|
|
26
26
|
if (maybeTriedParse === undefined) {
|
|
27
27
|
trace.exit();
|
|
28
28
|
return {
|
|
@@ -36,7 +36,7 @@ function validate(textDocument, validationSettings) {
|
|
|
36
36
|
(PQP.TaskUtils.isParseStageOk(maybeTriedParse) || PQP.TaskUtils.isParseStageParseError(maybeTriedParse))) {
|
|
37
37
|
const nodeIdMapCollection = maybeTriedParse.nodeIdMapCollection;
|
|
38
38
|
functionExpressionDiagnostics = (0, validateFunctionExpression_1.validateFunctionExpression)(updatedSettings, nodeIdMapCollection);
|
|
39
|
-
invokeExpressionDiagnostics = yield (0, validateInvokeExpression_1.validateInvokeExpression)(updatedSettings, nodeIdMapCollection, workspaceCache_1.WorkspaceCacheUtils.getTypeCache(textDocument));
|
|
39
|
+
invokeExpressionDiagnostics = yield (0, validateInvokeExpression_1.validateInvokeExpression)(updatedSettings, nodeIdMapCollection, workspaceCache_1.WorkspaceCacheUtils.getTypeCache(textDocument, validationSettings.isWorkspaceCacheAllowed));
|
|
40
40
|
}
|
|
41
41
|
else {
|
|
42
42
|
functionExpressionDiagnostics = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAMpD,iFAA8E;AAC9E,6EAA0E;AAC1E,yEAAsE;AACtE,+DAA4D;AAI5D,sDAAwD;AAExD,SAAsB,QAAQ,CAC1B,YAA0B,EAC1B,kBAAsC;;QAEtC,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,gCAEtD,QAAQ,CAAC,IAAI,EACb,kBAAkB,CAAC,yBAAyB,CAC/C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,eAAe,GAAwC,MAAM,oCAAmB,CAAC,uBAAuB,CAC1G,YAAY,EACZ,eAAe,
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAMpD,iFAA8E;AAC9E,6EAA0E;AAC1E,yEAAsE;AACtE,+DAA4D;AAI5D,sDAAwD;AAExD,SAAsB,QAAQ,CAC1B,YAA0B,EAC1B,kBAAsC;;QAEtC,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,gCAEtD,QAAQ,CAAC,IAAI,EACb,kBAAkB,CAAC,yBAAyB,CAC/C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,eAAe,GAAwC,MAAM,oCAAmB,CAAC,uBAAuB,CAC1G,YAAY,EACZ,eAAe,EACf,eAAe,CAAC,uBAAuB,CAC1C,CAAC;QAEF,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO;gBACH,WAAW,EAAE,EAAE;gBACf,cAAc,EAAE,KAAK;aACxB,CAAC;SACL;QAED,IAAI,6BAA2C,CAAC;QAChD,IAAI,2BAAyC,CAAC;QAE9C,IACI,eAAe,CAAC,sBAAsB;YACtC,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAC,EAC1G;YACE,MAAM,mBAAmB,GAAyB,eAAe,CAAC,mBAAmB,CAAC;YAEtF,6BAA6B,GAAG,IAAA,uDAA0B,EAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;YAEjG,2BAA2B,GAAG,MAAM,IAAA,mDAAwB,EACxD,eAAe,EACf,mBAAmB,EACnB,oCAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,kBAAkB,CAAC,uBAAuB,CAAC,CAC7F,CAAC;SACL;aAAM;YACH,6BAA6B,GAAG,EAAE,CAAC;YACnC,2BAA2B,GAAG,EAAE,CAAC;SACpC;QAED,MAAM,MAAM,GAAqB;YAC7B,WAAW,EAAE;gBACT,GAAG,CAAC,MAAM,IAAA,2DAA4B,EAAC,YAAY,EAAE,eAAe,CAAC,CAAC;gBACtE,GAAG,CAAC,MAAM,IAAA,yCAAmB,EAAC,YAAY,EAAE,eAAe,CAAC,CAAC;gBAC7D,GAAG,6BAA6B;gBAChC,GAAG,2BAA2B;aACjC;YACD,cAAc,EACV,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,eAAe,CAAC;SACzG,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AAjED,4BAiEC"}
|
|
@@ -27,7 +27,7 @@ function validateDuplicateIdentifiers(textDocument, validationSettings) {
|
|
|
27
27
|
trace.exit();
|
|
28
28
|
return [];
|
|
29
29
|
}
|
|
30
|
-
const maybeParsePromise = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, updatedSettings);
|
|
30
|
+
const maybeParsePromise = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, updatedSettings, updatedSettings.isWorkspaceCacheAllowed);
|
|
31
31
|
if (maybeParsePromise === undefined) {
|
|
32
32
|
trace.exit();
|
|
33
33
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,6EAAwH;AACxH,sFAKmE;AAKnE,kDAAkE;AAClE,gEAA6D;AAC7D,0BAAmC;AAGnC,sDAAwD;AAExD,SAAsB,4BAA4B,CAC9C,YAA0B,EAC1B,kBAAsC;;QAEtC,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,gCAEtD,4BAA4B,CAAC,IAAI,EACjC,kBAAkB,CAAC,yBAAyB,CAC/C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,4BAA4B,EAAE;YAC/C,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,EAAE,CAAC;SACb;QAED,MAAM,iBAAiB,GAAwC,MAAM,oCAAmB,CAAC,uBAAuB,CAC5G,YAAY,EACZ,eAAe,
|
|
1
|
+
{"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,13 +21,13 @@ function validateLexAndParse(textDocument, validationSettings) {
|
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateLexAndParse.name, validationSettings.maybeInitialCorrelationId);
|
|
23
23
|
const updatedSettings = Object.assign(Object.assign({}, validationSettings), { maybeInitialCorrelationId: trace.id });
|
|
24
|
-
const parsePromise = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, updatedSettings);
|
|
24
|
+
const parsePromise = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, updatedSettings, updatedSettings.isWorkspaceCacheAllowed);
|
|
25
25
|
if (parsePromise !== undefined) {
|
|
26
26
|
const result = yield validateParse(parsePromise, updatedSettings);
|
|
27
27
|
trace.exit();
|
|
28
28
|
return result;
|
|
29
29
|
}
|
|
30
|
-
const lexPromise = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateLexPromise(textDocument, updatedSettings);
|
|
30
|
+
const lexPromise = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateLexPromise(textDocument, updatedSettings, updatedSettings.isWorkspaceCacheAllowed);
|
|
31
31
|
if (lexPromise !== undefined) {
|
|
32
32
|
const result = validateLex(lexPromise, updatedSettings);
|
|
33
33
|
trace.exit();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateLexAndParse.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateLexAndParse.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,6EAA8F;AAC9F,sFAAyG;AAKzG,gEAA6D;AAG7D,sDAAwD;AAExD,SAAsB,mBAAmB,CACrC,YAA0B,EAC1B,kBAAsC;;QAEtC,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,gCAEtD,mBAAmB,CAAC,IAAI,EACxB,kBAAkB,CAAC,yBAAyB,CAC/C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,YAAY,GAAwC,MAAM,oCAAmB,CAAC,uBAAuB,CACvG,YAAY,EACZ,eAAe,
|
|
1
|
+
{"version":3,"file":"validateLexAndParse.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateLexAndParse.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,9 @@ import { CacheCollection } from "./workspaceCache";
|
|
|
5
5
|
import { Inspection } from "..";
|
|
6
6
|
import { InspectionSettings } from "../inspectionSettings";
|
|
7
7
|
export declare function close(textDocument: TextDocument): void;
|
|
8
|
-
export declare function getTypeCache(textDocument: TextDocument): Inspection.TypeCache;
|
|
9
|
-
export declare function getOrCreateCacheCollection(textDocument: TextDocument): CacheCollection;
|
|
10
|
-
export declare function getOrCreateLexPromise(textDocument: TextDocument, lexSettings: PQP.LexSettings): Promise<PQP.Task.TriedLexTask>;
|
|
11
|
-
export declare function getOrCreateParsePromise(textDocument: TextDocument, lexAndParseSettings: PQP.LexSettings & PQP.ParseSettings): Promise<PQP.Task.TriedParseTask | undefined>;
|
|
8
|
+
export declare function getTypeCache(textDocument: TextDocument, isWorkspaceCacheAllowed: boolean): Inspection.TypeCache;
|
|
9
|
+
export declare function getOrCreateCacheCollection(textDocument: TextDocument, isWorkspaceCacheAllowed: boolean): CacheCollection;
|
|
10
|
+
export declare function getOrCreateLexPromise(textDocument: TextDocument, lexSettings: PQP.LexSettings, isWorkspaceCacheAllowed: boolean): Promise<PQP.Task.TriedLexTask>;
|
|
11
|
+
export declare function getOrCreateParsePromise(textDocument: TextDocument, lexAndParseSettings: PQP.LexSettings & PQP.ParseSettings, isWorkspaceCacheAllowed: boolean): Promise<PQP.Task.TriedParseTask | undefined>;
|
|
12
12
|
export declare function getOrCreateInspectedPromise(textDocument: TextDocument, inspectionSettings: InspectionSettings, position: Position): Promise<Inspection.Inspected | undefined>;
|
|
13
13
|
export declare function update(textDocument: TextDocument, _changes: ReadonlyArray<TextDocumentContentChangeEvent>, _version: number): void;
|
|
@@ -21,12 +21,18 @@ function close(textDocument) {
|
|
|
21
21
|
CacheCollectionByCacheKey.delete(collectionCacheKey);
|
|
22
22
|
}
|
|
23
23
|
exports.close = close;
|
|
24
|
-
function getTypeCache(textDocument) {
|
|
25
|
-
|
|
24
|
+
function getTypeCache(textDocument, isWorkspaceCacheAllowed) {
|
|
25
|
+
if (!isWorkspaceCacheAllowed) {
|
|
26
|
+
return inspection_1.TypeCacheUtils.createEmptyCache();
|
|
27
|
+
}
|
|
28
|
+
const cacheCollection = getOrCreateCacheCollection(textDocument, isWorkspaceCacheAllowed);
|
|
26
29
|
return cacheCollection.typeCache;
|
|
27
30
|
}
|
|
28
31
|
exports.getTypeCache = getTypeCache;
|
|
29
|
-
function getOrCreateCacheCollection(textDocument) {
|
|
32
|
+
function getOrCreateCacheCollection(textDocument, isWorkspaceCacheAllowed) {
|
|
33
|
+
if (!isWorkspaceCacheAllowed) {
|
|
34
|
+
return createEmptyCacheCollection(textDocument.version);
|
|
35
|
+
}
|
|
30
36
|
const cacheKey = createCollectionCacheKey(textDocument);
|
|
31
37
|
const maybeCollection = CacheCollectionByCacheKey.get(cacheKey);
|
|
32
38
|
if (maybeCollection !== undefined) {
|
|
@@ -37,13 +43,15 @@ function getOrCreateCacheCollection(textDocument) {
|
|
|
37
43
|
close(textDocument);
|
|
38
44
|
}
|
|
39
45
|
}
|
|
40
|
-
const cacheCollection =
|
|
41
|
-
|
|
46
|
+
const cacheCollection = createEmptyCacheCollection(textDocument.version);
|
|
47
|
+
if (isWorkspaceCacheAllowed) {
|
|
48
|
+
CacheCollectionByCacheKey.set(cacheKey, cacheCollection);
|
|
49
|
+
}
|
|
42
50
|
return cacheCollection;
|
|
43
51
|
}
|
|
44
52
|
exports.getOrCreateCacheCollection = getOrCreateCacheCollection;
|
|
45
|
-
function getOrCreateLexPromise(textDocument, lexSettings) {
|
|
46
|
-
const cacheCollection = getOrCreateCacheCollection(textDocument);
|
|
53
|
+
function getOrCreateLexPromise(textDocument, lexSettings, isWorkspaceCacheAllowed) {
|
|
54
|
+
const cacheCollection = getOrCreateCacheCollection(textDocument, isWorkspaceCacheAllowed);
|
|
47
55
|
if (cacheCollection.maybeLex) {
|
|
48
56
|
return cacheCollection.maybeLex;
|
|
49
57
|
}
|
|
@@ -52,13 +60,13 @@ function getOrCreateLexPromise(textDocument, lexSettings) {
|
|
|
52
60
|
return lexPromise;
|
|
53
61
|
}
|
|
54
62
|
exports.getOrCreateLexPromise = getOrCreateLexPromise;
|
|
55
|
-
function getOrCreateParsePromise(textDocument, lexAndParseSettings) {
|
|
63
|
+
function getOrCreateParsePromise(textDocument, lexAndParseSettings, isWorkspaceCacheAllowed) {
|
|
56
64
|
return __awaiter(this, void 0, void 0, function* () {
|
|
57
|
-
const cacheCollection = getOrCreateCacheCollection(textDocument);
|
|
65
|
+
const cacheCollection = getOrCreateCacheCollection(textDocument, isWorkspaceCacheAllowed);
|
|
58
66
|
if (cacheCollection.maybeParse) {
|
|
59
67
|
return cacheCollection.maybeParse;
|
|
60
68
|
}
|
|
61
|
-
const maybeTriedLexPromise = getOrCreateLexPromise(textDocument, lexAndParseSettings);
|
|
69
|
+
const maybeTriedLexPromise = getOrCreateLexPromise(textDocument, lexAndParseSettings, isWorkspaceCacheAllowed);
|
|
62
70
|
const maybeTriedLex = yield maybeTriedLexPromise;
|
|
63
71
|
if (PQP.TaskUtils.isError(maybeTriedLex)) {
|
|
64
72
|
cacheCollection.maybeParse = Promise.resolve(undefined);
|
|
@@ -71,17 +79,19 @@ function getOrCreateParsePromise(textDocument, lexAndParseSettings) {
|
|
|
71
79
|
exports.getOrCreateParsePromise = getOrCreateParsePromise;
|
|
72
80
|
function getOrCreateInspectedPromise(textDocument, inspectionSettings, position) {
|
|
73
81
|
return __awaiter(this, void 0, void 0, function* () {
|
|
74
|
-
const cacheCollection = getOrCreateCacheCollection(textDocument);
|
|
82
|
+
const cacheCollection = getOrCreateCacheCollection(textDocument, inspectionSettings.isWorkspaceCacheAllowed);
|
|
75
83
|
const positionMapKey = createInspectionByPositionKey(position);
|
|
76
84
|
if (cacheCollection.inspectionByPosition.has(positionMapKey)) {
|
|
77
85
|
return cacheCollection.inspectionByPosition.get(positionMapKey);
|
|
78
86
|
}
|
|
79
|
-
const maybeTriedParsePromise = getOrCreateParsePromise(textDocument, inspectionSettings);
|
|
87
|
+
const maybeTriedParsePromise = getOrCreateParsePromise(textDocument, inspectionSettings, inspectionSettings.isWorkspaceCacheAllowed);
|
|
80
88
|
const maybeTriedParse = yield maybeTriedParsePromise;
|
|
81
89
|
if (maybeTriedParse === undefined ||
|
|
82
90
|
!PQP.TaskUtils.isParseStage(maybeTriedParse) ||
|
|
83
91
|
PQP.TaskUtils.isParseStageCommonError(maybeTriedParse)) {
|
|
84
|
-
|
|
92
|
+
if (inspectionSettings.isWorkspaceCacheAllowed) {
|
|
93
|
+
cacheCollection.inspectionByPosition.set(positionMapKey, undefined);
|
|
94
|
+
}
|
|
85
95
|
return undefined;
|
|
86
96
|
}
|
|
87
97
|
let parseState;
|
|
@@ -105,7 +115,7 @@ exports.update = update;
|
|
|
105
115
|
function createCollectionCacheKey(textDocument) {
|
|
106
116
|
return `${textDocument.uri}`;
|
|
107
117
|
}
|
|
108
|
-
function
|
|
118
|
+
function createEmptyCacheCollection(version) {
|
|
109
119
|
return {
|
|
110
120
|
maybeLex: undefined,
|
|
111
121
|
maybeParse: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaceCacheUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/workspaceCache/workspaceCacheUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAKpD,0BAAgC;AAEhC,8CAA+C;AAE/C,MAAM,yBAAyB,GAAiC,IAAI,GAAG,EAAE,CAAC;AAE1E,SAAgB,KAAK,CAAC,YAA0B;IAC5C,MAAM,kBAAkB,GAAW,wBAAwB,CAAC,YAAY,CAAC,CAAC;IAC1E,yBAAyB,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;AACzD,CAAC;AAHD,sBAGC;AAED,SAAgB,YAAY,CAAC,YAA0B;
|
|
1
|
+
{"version":3,"file":"workspaceCacheUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/workspaceCache/workspaceCacheUtils.ts"],"names":[],"mappings":"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"}
|