@microsoft/powerquery-language-services 0.3.22 → 0.3.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. package/lib/powerquery-language-services/documentSymbols.js +23 -21
  2. package/lib/powerquery-language-services/documentSymbols.js.map +1 -1
  3. package/lib/powerquery-language-services/inspection/type/inspectType/common.js +3 -4
  4. package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map +1 -1
  5. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js +52 -40
  6. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map +1 -1
  7. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.d.ts +1 -1
  8. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js +32 -20
  9. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map +1 -1
  10. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.d.ts +1 -1
  11. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js +22 -9
  12. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map +1 -1
  13. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.d.ts +1 -1
  14. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js +23 -12
  15. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map +1 -1
  16. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js +32 -21
  17. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js.map +1 -1
  18. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.d.ts +1 -1
  19. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js +27 -15
  20. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map +1 -1
  21. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.d.ts +1 -1
  22. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js +17 -6
  23. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map +1 -1
  24. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.d.ts +1 -1
  25. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js +25 -14
  26. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map +1 -1
  27. package/lib/powerquery-language-services/inspection/type/task.js +22 -27
  28. package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
  29. package/lib/powerquery-language-services/inspectionSettings.d.ts +5 -0
  30. package/lib/powerquery-language-services/inspectionUtils.d.ts +2 -4
  31. package/lib/powerquery-language-services/inspectionUtils.js +3 -3
  32. package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
  33. package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js +61 -50
  34. package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map +1 -1
  35. package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.d.ts +1 -1
  36. package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js +3 -2
  37. package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js.map +1 -1
  38. package/package.json +3 -3
@@ -13,6 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
13
13
  Object.defineProperty(exports, "__esModule", { value: true });
14
14
  exports.inspectTypeRecord = void 0;
15
15
  const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
16
+ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
16
17
  const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
17
18
  const __1 = require("../../..");
18
19
  const common_1 = require("./common");
@@ -22,23 +23,34 @@ function inspectTypeRecord(state, xorNode, maybeCorrelationId) {
22
23
  const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecord.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
23
24
  (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
24
25
  parser_1.XorNodeUtils.assertIsRecord(xorNode);
25
- const fields = new Map();
26
- for (const keyValuePair of parser_1.NodeIdMapIterator.iterRecord(state.nodeIdMapCollection, xorNode)) {
27
- if (keyValuePair.maybeValue) {
28
- // eslint-disable-next-line no-await-in-loop
29
- fields.set(keyValuePair.keyLiteral, yield (0, common_1.inspectXor)(state, keyValuePair.maybeValue, trace.id));
30
- }
31
- else {
32
- fields.set(keyValuePair.keyLiteral, language_1.Type.UnknownInstance);
26
+ let result;
27
+ switch (state.typeStrategy) {
28
+ case "Extended" /* Extended */: {
29
+ const fields = new Map();
30
+ for (const keyValuePair of parser_1.NodeIdMapIterator.iterRecord(state.nodeIdMapCollection, xorNode)) {
31
+ if (keyValuePair.maybeValue) {
32
+ // eslint-disable-next-line no-await-in-loop
33
+ fields.set(keyValuePair.keyLiteral, yield (0, common_1.inspectXor)(state, keyValuePair.maybeValue, trace.id));
34
+ }
35
+ else {
36
+ fields.set(keyValuePair.keyLiteral, language_1.Type.UnknownInstance);
37
+ }
38
+ }
39
+ result = {
40
+ kind: "Record" /* Record */,
41
+ maybeExtendedKind: "DefinedRecord" /* DefinedRecord */,
42
+ isNullable: false,
43
+ fields,
44
+ isOpen: false,
45
+ };
46
+ break;
33
47
  }
48
+ case "Primitive" /* Primitive */:
49
+ result = language_1.Type.RecordInstance;
50
+ break;
51
+ default:
52
+ throw powerquery_parser_1.Assert.isNever(state.typeStrategy);
34
53
  }
35
- const result = {
36
- kind: "Record" /* Record */,
37
- maybeExtendedKind: "DefinedRecord" /* DefinedRecord */,
38
- isNullable: false,
39
- fields,
40
- isOpen: false,
41
- };
42
54
  trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
43
55
  return result;
44
56
  });
@@ -1 +1 @@
1
- {"version":3,"file":"inspectTypeRecord.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAsH;AAEtH,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAExD,SAAsB,iBAAiB,CACnC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,iBAAiB,CAAC,IAAI,EACtB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAErC,MAAM,MAAM,GAAsC,IAAI,GAAG,EAAE,CAAC;QAE5D,KAAK,MAAM,YAAY,IAAI,0BAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;YACzF,IAAI,YAAY,CAAC,UAAU,EAAE;gBACzB,4CAA4C;gBAC5C,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;aACnG;iBAAM;gBACH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,eAAI,CAAC,eAAe,CAAC,CAAC;aAC7D;SACJ;QAED,MAAM,MAAM,GAAyB;YACjC,IAAI,uBAAsB;YAC1B,iBAAiB,qCAAqC;YACtD,UAAU,EAAE,KAAK;YACjB,MAAM;YACN,MAAM,EAAE,KAAK;SAChB,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AArCD,8CAqCC"}
1
+ {"version":3,"file":"inspectTypeRecord.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAsH;AAEtH,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,iBAAiB,CACnC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,iBAAiB,CAAC,IAAI,EACtB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,MAAwC,CAAC;QAE7C,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,MAAM,GAAsC,IAAI,GAAG,EAAE,CAAC;gBAE5D,KAAK,MAAM,YAAY,IAAI,0BAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;oBACzF,IAAI,YAAY,CAAC,UAAU,EAAE;wBACzB,4CAA4C;wBAC5C,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;qBACnG;yBAAM;wBACH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,eAAI,CAAC,eAAe,CAAC,CAAC;qBAC7D;iBACJ;gBAED,MAAM,GAAG;oBACL,IAAI,uBAAsB;oBAC1B,iBAAiB,qCAAqC;oBACtD,UAAU,EAAE,KAAK;oBACjB,MAAM;oBACN,MAAM,EAAE,KAAK;iBAChB,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,cAAc,CAAC;gBAC7B,MAAM;YAEV;gBACI,MAAM,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAChD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnDD,8CAmDC"}
@@ -1,4 +1,4 @@
1
1
  import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
2
2
  import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
3
3
  import { InspectTypeState } from "./common";
4
- export declare function inspectTypeRecordType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.RecordType | Type.Unknown>;
4
+ export declare function inspectTypeRecordType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.Type | Type.RecordType | Type.Unknown>;
@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
14
14
  exports.inspectTypeRecordType = void 0;
15
15
  const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
16
16
  const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
17
+ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
17
18
  const __1 = require("../../..");
18
19
  const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
19
20
  function inspectTypeRecordType(state, xorNode, maybeCorrelationId) {
@@ -22,13 +23,23 @@ function inspectTypeRecordType(state, xorNode, maybeCorrelationId) {
22
23
  const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecordType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
23
24
  (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
24
25
  parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RecordType" /* RecordType */);
25
- const maybeFields = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "FieldSpecificationList" /* FieldSpecificationList */);
26
26
  let result;
27
- if (maybeFields === undefined) {
28
- result = language_1.Type.UnknownInstance;
29
- }
30
- else {
31
- result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeFields, trace.id)));
27
+ switch (state.typeStrategy) {
28
+ case "Extended" /* Extended */: {
29
+ const maybeFields = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "FieldSpecificationList" /* FieldSpecificationList */);
30
+ if (maybeFields === undefined) {
31
+ result = language_1.Type.UnknownInstance;
32
+ }
33
+ else {
34
+ result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeFields, trace.id)));
35
+ }
36
+ break;
37
+ }
38
+ case "Primitive" /* Primitive */:
39
+ result = language_1.Type.TypePrimitiveInstance;
40
+ break;
41
+ default:
42
+ powerquery_parser_1.Assert.isNever(state.typeStrategy);
32
43
  }
33
44
  trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
34
45
  return result;
@@ -1 +1 @@
1
- {"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,mFAAgF;AAGhF,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,MAAM,WAAW,GAAyB,uBAAc,CAAC,oBAAoB,CACzE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,wDAEJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,WAAW,KAAK,SAAS,EAAE;YAC3B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,mBACF,IAAI,qBACJ,iBAAiB,iCACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAtCD,sDAsCC"}
1
+ {"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,mFAAgF;AAIhF,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,IAAI,MAAkD,CAAC;QAEvD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,WAAW,GAAyB,uBAAc,CAAC,oBAAoB,CACzE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,wDAEJ,CAAC;gBAEF,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC3B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,mBACF,IAAI,qBACJ,iBAAiB,iCACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;iBACL;gBAED,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnDD,sDAmDC"}
@@ -1,4 +1,4 @@
1
1
  import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
2
2
  import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
3
3
  import { InspectTypeState } from "./common";
4
- export declare function inspectTypeTableType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TableType | Type.TableTypePrimaryExpression | Type.Unknown>;
4
+ export declare function inspectTypeTableType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.Type | Type.TableType | Type.TableTypePrimaryExpression | Type.Unknown>;
@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
14
14
  exports.inspectTypeTableType = void 0;
15
15
  const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
16
16
  const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
17
+ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
17
18
  const __1 = require("../../..");
18
19
  const common_1 = require("./common");
19
20
  const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
@@ -23,21 +24,31 @@ function inspectTypeTableType(state, xorNode, maybeCorrelationId) {
23
24
  const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeTableType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
24
25
  (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
25
26
  parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "TableType" /* TableType */);
26
- const maybeRowType = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
27
27
  let result;
28
- if (maybeRowType === undefined) {
29
- result = language_1.Type.UnknownInstance;
30
- }
31
- else if (maybeRowType.node.kind === "FieldSpecificationList" /* FieldSpecificationList */) {
32
- result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "TableType" /* TableType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeRowType, trace.id)));
33
- }
34
- else {
35
- result = {
36
- kind: "Type" /* Type */,
37
- maybeExtendedKind: "TableTypePrimaryExpression" /* TableTypePrimaryExpression */,
38
- isNullable: false,
39
- primaryExpression: yield (0, common_1.inspectXor)(state, maybeRowType, trace.id),
40
- };
28
+ switch (state.typeStrategy) {
29
+ case "Extended" /* Extended */: {
30
+ const maybeRowType = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
31
+ if (maybeRowType === undefined) {
32
+ result = language_1.Type.UnknownInstance;
33
+ }
34
+ else if (maybeRowType.node.kind === "FieldSpecificationList" /* FieldSpecificationList */) {
35
+ result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "TableType" /* TableType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeRowType, trace.id)));
36
+ }
37
+ else {
38
+ result = {
39
+ kind: "Type" /* Type */,
40
+ maybeExtendedKind: "TableTypePrimaryExpression" /* TableTypePrimaryExpression */,
41
+ isNullable: false,
42
+ primaryExpression: yield (0, common_1.inspectXor)(state, maybeRowType, trace.id),
43
+ };
44
+ }
45
+ break;
46
+ }
47
+ case "Primitive" /* Primitive */:
48
+ result = language_1.Type.TypePrimitiveInstance;
49
+ break;
50
+ default:
51
+ powerquery_parser_1.Assert.isNever(state.typeStrategy);
41
52
  }
42
53
  trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
43
54
  return result;
@@ -1 +1 @@
1
- {"version":3,"file":"inspectTypeTableType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAwD;AACxD,mFAAgF;AAEhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAgB,OAAO,8BAAyB,CAAC;QAE9E,MAAM,YAAY,GAAyB,uBAAc,CAAC,aAAa,CACnE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,0DAAwC,EAAE;YACvE,MAAM,mBACF,IAAI,qBACJ,iBAAiB,+BACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAC1E,CAAC;SACL;aAAM;YACH,MAAM,GAAG;gBACL,IAAI,mBAAoB;gBACxB,iBAAiB,+DAAkD;gBACnE,UAAU,EAAE,KAAK;gBACjB,iBAAiB,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;aACrE,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA5CD,oDA4CC"}
1
+ {"version":3,"file":"inspectTypeTableType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,qCAAwD;AACxD,mFAAgF;AAGhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAgB,OAAO,8BAAyB,CAAC;QAE9E,IAAI,MAAmF,CAAC;QAExF,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,YAAY,GAAyB,uBAAc,CAAC,aAAa,CACnE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;gBAEF,IAAI,YAAY,KAAK,SAAS,EAAE;oBAC5B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,0DAAwC,EAAE;oBACvE,MAAM,mBACF,IAAI,qBACJ,iBAAiB,+BACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAC1E,CAAC;iBACL;qBAAM;oBACH,MAAM,GAAG;wBACL,IAAI,mBAAoB;wBACxB,iBAAiB,+DAAkD;wBACnE,UAAU,EAAE,KAAK;wBACjB,iBAAiB,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;qBACrE,CAAC;iBACL;gBAED,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAzDD,oDAyDC"}
@@ -23,41 +23,20 @@ function tryScopeType(settings, nodeIdMapCollection, nodeId,
23
23
  typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
24
24
  return __awaiter(this, void 0, void 0, function* () {
25
25
  const trace = settings.traceManager.entry("Inspection.ScopeType" /* InspectScopeType */, tryScopeType.name, settings.maybeInitialCorrelationId);
26
- const state = {
27
- library: settings.library,
28
- locale: settings.locale,
29
- isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
30
- maybeCancellationToken: settings.maybeCancellationToken,
31
- maybeEachScopeById: settings.maybeEachScopeById,
32
- maybeInitialCorrelationId: trace.id,
33
- traceManager: settings.traceManager,
34
- givenTypeById: typeCache.typeById,
35
- deltaTypeById: new Map(),
36
- nodeIdMapCollection,
37
- scopeById: typeCache.scopeById,
38
- };
26
+ const state = createState(settings, nodeIdMapCollection, typeCache, trace.id);
39
27
  const result = powerquery_parser_1.ResultUtils.ensureResultAsync(() => inspectScopeType(state, nodeId, trace.id), settings.locale);
40
28
  trace.exit();
41
29
  return result;
42
30
  });
43
31
  }
44
32
  exports.tryScopeType = tryScopeType;
45
- function tryType(settings, nodeIdMapCollection, nodeId, typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
33
+ function tryType(settings, nodeIdMapCollection, nodeId,
34
+ // If a TypeCache is given, then potentially add to its values and include it as part of the return,
35
+ // Else create a new TypeCache and include it in the return.
36
+ typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
46
37
  return __awaiter(this, void 0, void 0, function* () {
47
38
  const trace = settings.traceManager.entry("Inspection.Type" /* InspectType */, tryType.name, settings.maybeInitialCorrelationId);
48
- const state = {
49
- library: settings.library,
50
- locale: settings.locale,
51
- isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
52
- maybeCancellationToken: settings.maybeCancellationToken,
53
- maybeEachScopeById: settings.maybeEachScopeById,
54
- maybeInitialCorrelationId: trace.id,
55
- traceManager: settings.traceManager,
56
- givenTypeById: typeCache.typeById,
57
- deltaTypeById: new Map(),
58
- nodeIdMapCollection,
59
- scopeById: typeCache.scopeById,
60
- };
39
+ const state = createState(settings, nodeIdMapCollection, typeCache, trace.id);
61
40
  const result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => (0, inspectType_1.inspectXor)(state, parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId), trace.id), settings.locale);
62
41
  trace.exit({ ["IsError" /* IsError */]: result.kind });
63
42
  return result;
@@ -86,4 +65,20 @@ function inspectScopeType(state, nodeId, correlationId) {
86
65
  return result;
87
66
  });
88
67
  }
68
+ function createState(settings, nodeIdMapCollection, typeCache, correlationId) {
69
+ return {
70
+ library: settings.library,
71
+ locale: settings.locale,
72
+ isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
73
+ maybeCancellationToken: settings.maybeCancellationToken,
74
+ maybeEachScopeById: settings.maybeEachScopeById,
75
+ maybeInitialCorrelationId: correlationId,
76
+ traceManager: settings.traceManager,
77
+ typeStrategy: settings.typeStrategy,
78
+ givenTypeById: typeCache.typeById,
79
+ deltaTypeById: new Map(),
80
+ nodeIdMapCollection,
81
+ scopeById: typeCache.scopeById,
82
+ };
83
+ }
89
84
  //# sourceMappingURL=task.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,13 @@
1
1
  import * as PQP from "@microsoft/powerquery-parser";
2
2
  import { Library } from "./library";
3
3
  import { TypeById } from "./inspection";
4
+ export declare const enum TypeStrategy {
5
+ Extended = "Extended",
6
+ Primitive = "Primitive"
7
+ }
4
8
  export interface InspectionSettings extends PQP.Settings {
5
9
  readonly isWorkspaceCacheAllowed: boolean;
6
10
  readonly library: Library.ILibrary;
7
11
  readonly maybeEachScopeById: TypeById | undefined;
12
+ readonly typeStrategy: TypeStrategy;
8
13
  }
@@ -3,11 +3,9 @@ import { Ast, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/la
3
3
  import { DocumentSymbol, SignatureHelp, SymbolKind } from "vscode-languageserver-types";
4
4
  import { AutocompleteItemProviderContext, SignatureProviderContext } from "./providers/commonTypes";
5
5
  import { Inspection } from ".";
6
- import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
7
6
  import { InspectionSettings } from "./inspectionSettings";
8
- import { Library } from "./library";
9
- import { TypeById } from "./inspection";
10
- export declare function createInspectionSettings(settings: PQP.Settings, maybeEachScopeById: TypeById | undefined, maybeLibrary: Library.ILibrary | undefined, isWorkspaceCacheAllowed: boolean): InspectionSettings;
7
+ import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
8
+ export declare function createInspectionSettings(settings: PQP.Settings, overrides?: Partial<InspectionSettings>): InspectionSettings;
11
9
  export declare function getMaybeContextForSignatureProvider(inspected: Inspection.Inspected, traceManager: TraceManager, maybeCorrelationId: number | undefined): Promise<SignatureProviderContext | undefined>;
12
10
  export declare function getMaybeSignatureHelp(context: SignatureProviderContext, correlationId: number): SignatureHelp | null;
13
11
  export declare function getMaybeType(inspected: Inspection.Inspected, identifier: string): Promise<Type.TPowerQueryType | undefined>;
@@ -18,9 +18,9 @@ const vscode_languageserver_types_1 = require("vscode-languageserver-types");
18
18
  const _1 = require(".");
19
19
  const autocomplete_1 = require("./inspection/autocomplete");
20
20
  const library_1 = require("./library");
21
- function createInspectionSettings(settings, maybeEachScopeById, maybeLibrary, isWorkspaceCacheAllowed) {
22
- return Object.assign(Object.assign({}, settings), { library: maybeLibrary !== null && maybeLibrary !== void 0 ? maybeLibrary : library_1.Library.NoOpLibrary, maybeEachScopeById,
23
- isWorkspaceCacheAllowed });
21
+ function createInspectionSettings(settings, overrides) {
22
+ var _a, _b, _c, _d;
23
+ return Object.assign(Object.assign({}, settings), { isWorkspaceCacheAllowed: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.isWorkspaceCacheAllowed) !== null && _a !== void 0 ? _a : true, library: (_b = overrides === null || overrides === void 0 ? void 0 : overrides.library) !== null && _b !== void 0 ? _b : library_1.Library.NoOpLibrary, typeStrategy: (_c = overrides === null || overrides === void 0 ? void 0 : overrides.typeStrategy) !== null && _c !== void 0 ? _c : "Extended" /* Extended */, maybeEachScopeById: (_d = overrides === null || overrides === void 0 ? void 0 : overrides.maybeEachScopeById) !== null && _d !== void 0 ? _d : undefined });
24
24
  }
25
25
  exports.createInspectionSettings = createInspectionSettings;
26
26
  function getMaybeContextForSignatureProvider(inspected, traceManager, maybeCorrelationId) {
@@ -1 +1 @@
1
- {"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":"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"}
@@ -47,80 +47,91 @@ function validateDuplicateIdentifiers(textDocument, validationSettings) {
47
47
  const documentUri = textDocument.uri;
48
48
  const nodeIdMapCollection = maybeNodeIdMapCollection;
49
49
  const result = [
50
- ...validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, updatedSettings),
51
- ...validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, updatedSettings),
52
- ...validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, updatedSettings),
50
+ ...validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
51
+ ...validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
52
+ ...validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
53
53
  ];
54
54
  trace.exit();
55
55
  return result;
56
56
  });
57
57
  }
58
58
  exports.validateDuplicateIdentifiers = validateDuplicateIdentifiers;
59
- function validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings) {
59
+ function validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings, correlationId) {
60
60
  var _a;
61
- const letIds = [
62
- ...((_a = nodeIdMapCollection.idsByNodeKind.get("LetExpression" /* LetExpression */)) !== null && _a !== void 0 ? _a : []),
63
- ];
64
- return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, letIds, parser_1.NodeIdMapIterator.iterLetExpression, validationSettings);
61
+ const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForLetExpresion.name, correlationId);
62
+ const letIds = (_a = nodeIdMapCollection.idsByNodeKind.get("LetExpression" /* LetExpression */)) !== null && _a !== void 0 ? _a : new Set();
63
+ const result = validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, [letIds], parser_1.NodeIdMapIterator.iterLetExpression, validationSettings, trace.id);
64
+ trace.exit();
65
+ return result;
65
66
  }
66
- function validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, validationSettings) {
67
- var _a, _b, _c;
67
+ function validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, validationSettings, correlationId) {
68
+ var _a, _b;
69
+ const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForRecord.name, correlationId);
68
70
  const recordIds = [
69
- ...((_a = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _a !== void 0 ? _a : []),
70
- ...((_b = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _b !== void 0 ? _b : []),
71
- ...((_c = nodeIdMapCollection.idsByNodeKind.get("RecordType" /* RecordType */)) !== null && _c !== void 0 ? _c : []),
71
+ (_a = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _a !== void 0 ? _a : new Set(),
72
+ (_b = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _b !== void 0 ? _b : new Set(),
72
73
  ];
73
- return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, parser_1.NodeIdMapIterator.iterRecord, validationSettings);
74
+ const result = validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, parser_1.NodeIdMapIterator.iterRecord, validationSettings, trace.id);
75
+ trace.exit();
76
+ return result;
74
77
  }
75
- function validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, validationSettings) {
78
+ function validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, validationSettings, correlationId) {
76
79
  var _a;
77
- const recordIds = [...((_a = nodeIdMapCollection.idsByNodeKind.get("Section" /* Section */)) !== null && _a !== void 0 ? _a : [])];
78
- return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, parser_1.NodeIdMapIterator.iterSection, validationSettings);
80
+ const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForSection.name, correlationId);
81
+ const sectionIds = (_a = nodeIdMapCollection.idsByNodeKind.get("Section" /* Section */)) !== null && _a !== void 0 ? _a : new Set();
82
+ const result = validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, [sectionIds], parser_1.NodeIdMapIterator.iterSection, validationSettings, trace.id);
83
+ trace.exit();
84
+ return result;
79
85
  }
80
86
  // Generalized logic for iterating over some collection and their children, essentially by doing:
81
87
  // for node in nodeIds:
82
88
  // for childOfNode in iterNodeFn(node):
83
89
  // ...
84
- function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, nodeIds, iterNodeFn, validationSettings) {
85
- if (!nodeIds.length) {
90
+ function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, nodeIdCollections, iterNodeFn, validationSettings, correlationId) {
91
+ const numIds = nodeIdCollections.reduce((partial, set) => partial + set.size, 0);
92
+ const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForKeyValuePair.name, correlationId, { numIds });
93
+ if (!numIds) {
86
94
  return [];
87
95
  }
88
96
  const result = [];
89
- for (const nodeId of nodeIds) {
90
- const node = parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId);
91
- const duplicateFieldsByKey = new Map();
92
- const knownFieldByKey = new Map();
93
- for (const field of iterNodeFn(nodeIdMapCollection, node)) {
94
- const keyLiteral = field.normalizedKeyLiteral;
95
- const maybeDuplicateFields = duplicateFieldsByKey.get(keyLiteral);
96
- const maybeKnownField = knownFieldByKey.get(keyLiteral);
97
- if (maybeDuplicateFields) {
98
- maybeDuplicateFields.push(field);
97
+ for (const collection of nodeIdCollections) {
98
+ for (const nodeId of collection) {
99
+ const node = parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId);
100
+ const duplicateFieldsByKey = new Map();
101
+ const knownFieldByKey = new Map();
102
+ for (const field of iterNodeFn(nodeIdMapCollection, node)) {
103
+ const keyLiteral = field.normalizedKeyLiteral;
104
+ const maybeDuplicateFields = duplicateFieldsByKey.get(keyLiteral);
105
+ const maybeKnownField = knownFieldByKey.get(keyLiteral);
106
+ if (maybeDuplicateFields) {
107
+ maybeDuplicateFields.push(field);
108
+ }
109
+ else if (maybeKnownField) {
110
+ duplicateFieldsByKey.set(keyLiteral, [field, maybeKnownField]);
111
+ }
112
+ else {
113
+ knownFieldByKey.set(keyLiteral, field);
114
+ }
99
115
  }
100
- else if (maybeKnownField) {
101
- duplicateFieldsByKey.set(keyLiteral, [field, maybeKnownField]);
102
- }
103
- else {
104
- knownFieldByKey.set(keyLiteral, field);
105
- }
106
- }
107
- for (const duplicates of duplicateFieldsByKey.values()) {
108
- const numFields = duplicates.length;
109
- const asRelatedInformation = duplicates.map((keyValuePair) => ({
110
- location: {
111
- uri: documentUri,
112
- range: __1.PositionUtils.createRangeFromTokenRange(keyValuePair.key.tokenRange),
113
- },
114
- message: createDuplicateIdentifierDiagnosticMessage(keyValuePair, validationSettings),
115
- }));
116
- for (let index = 0; index < numFields; index += 1) {
117
- const duplicate = duplicates[index];
118
- // Grab all DiagnosticRelatedInformation for a given key besides the one we're iterating over.
119
- const relatedInformation = asRelatedInformation.filter((_, relatedIndex) => index !== relatedIndex);
120
- result.push(createDuplicateIdentifierDiagnostic(duplicate, relatedInformation, validationSettings));
116
+ for (const duplicates of duplicateFieldsByKey.values()) {
117
+ const numFields = duplicates.length;
118
+ const asRelatedInformation = duplicates.map((keyValuePair) => ({
119
+ location: {
120
+ uri: documentUri,
121
+ range: __1.PositionUtils.createRangeFromTokenRange(keyValuePair.key.tokenRange),
122
+ },
123
+ message: createDuplicateIdentifierDiagnosticMessage(keyValuePair, validationSettings),
124
+ }));
125
+ for (let index = 0; index < numFields; index += 1) {
126
+ const duplicate = duplicates[index];
127
+ // Grab all DiagnosticRelatedInformation for a given key besides the one we're iterating over.
128
+ const relatedInformation = asRelatedInformation.filter((_, relatedIndex) => index !== relatedIndex);
129
+ result.push(createDuplicateIdentifierDiagnostic(duplicate, relatedInformation, validationSettings));
130
+ }
121
131
  }
122
132
  }
123
133
  }
134
+ trace.exit();
124
135
  return result;
125
136
  }
126
137
  function createDuplicateIdentifierDiagnostic(keyValuePair, relatedInformation, validationSettings) {
@@ -1 +1 @@
1
- {"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
1
  import { InspectionSettings } from "../..";
2
2
  import { ValidationSettings } from "./validationSettings";
3
- export declare function createValidationSettings(inspectionSettings: InspectionSettings, source: string, checkForDuplicateIdentifiers?: boolean, checkInvokeExpressions?: boolean, checkUnknownIdentifiers?: boolean): ValidationSettings;
3
+ export declare function createValidationSettings(inspectionSettings: InspectionSettings, source: string, overrides?: Partial<ValidationSettings>): ValidationSettings;
@@ -3,8 +3,9 @@
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
5
  exports.createValidationSettings = void 0;
6
- function createValidationSettings(inspectionSettings, source, checkForDuplicateIdentifiers, checkInvokeExpressions, checkUnknownIdentifiers) {
7
- return Object.assign(Object.assign({}, inspectionSettings), { checkForDuplicateIdentifiers: checkForDuplicateIdentifiers !== null && checkForDuplicateIdentifiers !== void 0 ? checkForDuplicateIdentifiers : true, checkInvokeExpressions: checkInvokeExpressions !== null && checkInvokeExpressions !== void 0 ? checkInvokeExpressions : true, checkUnknownIdentifiers: checkUnknownIdentifiers !== null && checkUnknownIdentifiers !== void 0 ? checkUnknownIdentifiers : true, library: inspectionSettings.library, source });
6
+ function createValidationSettings(inspectionSettings, source, overrides) {
7
+ var _a, _b, _c;
8
+ return Object.assign(Object.assign({}, inspectionSettings), { checkForDuplicateIdentifiers: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.checkForDuplicateIdentifiers) !== null && _a !== void 0 ? _a : true, checkInvokeExpressions: (_b = overrides === null || overrides === void 0 ? void 0 : overrides.checkInvokeExpressions) !== null && _b !== void 0 ? _b : true, checkUnknownIdentifiers: (_c = overrides === null || overrides === void 0 ? void 0 : overrides.checkUnknownIdentifiers) !== null && _c !== void 0 ? _c : true, library: inspectionSettings.library, source });
8
9
  }
9
10
  exports.createValidationSettings = createValidationSettings;
10
11
  //# sourceMappingURL=validationSettingsUtils.js.map
@@ -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,SAAgB,wBAAwB,CACpC,kBAAsC,EACtC,MAAc,EACd,4BAAsC,EACtC,sBAAgC,EAChC,uBAAiC;IAEjC,uCACO,kBAAkB,KACrB,4BAA4B,EAAE,4BAA4B,aAA5B,4BAA4B,cAA5B,4BAA4B,GAAI,IAAI,EAClE,sBAAsB,EAAE,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,IAAI,EACtD,uBAAuB,EAAE,uBAAuB,aAAvB,uBAAuB,cAAvB,uBAAuB,GAAI,IAAI,EACxD,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,MAAM,IACR;AACN,CAAC;AAfD,4DAeC"}
1
+ {"version":3,"file":"validationSettingsUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/validate/validationSettings/validationSettingsUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,SAAgB,wBAAwB,CACpC,kBAAsC,EACtC,MAAc,EACd,SAAuC;;IAEvC,uCACO,kBAAkB,KACrB,4BAA4B,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,4BAA4B,mCAAI,IAAI,EAC7E,sBAAsB,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,sBAAsB,mCAAI,IAAI,EACjE,uBAAuB,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,uBAAuB,mCAAI,IAAI,EACnE,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,MAAM,IACR;AACN,CAAC;AAbD,4DAaC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@microsoft/powerquery-language-services",
3
- "version": "0.3.22",
3
+ "version": "0.3.25",
4
4
  "author": "Microsoft",
5
5
  "license": "MIT",
6
6
  "scripts": {
@@ -49,8 +49,8 @@
49
49
  "typescript": "4.6.4"
50
50
  },
51
51
  "dependencies": {
52
- "@microsoft/powerquery-formatter": "0.0.53",
53
- "@microsoft/powerquery-parser": "0.8.5",
52
+ "@microsoft/powerquery-formatter": "0.0.54",
53
+ "@microsoft/powerquery-parser": "0.8.6",
54
54
  "vscode-languageserver-textdocument": "1.0.4",
55
55
  "vscode-languageserver-types": "3.17.1"
56
56
  },