@microsoft/powerquery-language-services 0.3.26 → 0.3.27

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.
@@ -16,7 +16,7 @@ function autocompleteKeywordErrorHandlingExpression(state) {
16
16
  }
17
17
  else if (maybeChildAttributeIndex === 1) {
18
18
  // 'try true o|' creates a ParseError.
19
- // It's ambiguous if the next token should be either 'otherwise' or 'or'.
19
+ // It's ambiguous if the next token should be either 'otherwise', 'or', or 'catch'.
20
20
  if (maybeTrailingText !== undefined) {
21
21
  const trailingToken = maybeTrailingText;
22
22
  // First we test if we can autocomplete using the error token.
@@ -1 +1 @@
1
- {"version":3,"file":"autocompleteKeywordErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAA6F;AAC7F,sFAAmG;AAInG,gCAAyC;AAGzC,SAAgB,0CAA0C,CACtD,KAAsC;IAEtC,MAAM,QAAQ,GAAa,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,MAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IACpC,MAAM,iBAAiB,GAA8B,KAAK,CAAC,kBAAkB,CAAC;IAE9E,MAAM,wBAAwB,GAAuB,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;IAEpF,IAAI,wBAAwB,KAAK,CAAC,EAAE;QAChC,OAAO,iBAAyB,CAAC;KACpC;SAAM,IAAI,wBAAwB,KAAK,CAAC,EAAE;QACvC,sCAAsC;QACtC,yEAAyE;QACzE,IAAI,iBAAiB,KAAK,SAAS,EAAE;YACjC,MAAM,aAAa,GAAkB,iBAAiB,CAAC;YAEvD,8DAA8D;YAC9D,IACI,aAAa,CAAC,IAAI,kCAA+B;gBACjD,iBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,EAC/D;gBACE,MAAM,SAAS,GAAW,iBAAiB,CAAC,IAAI,CAAC;gBAEjD,iFAAiF;gBACjF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,4BAA8B,UAAU,CAAC,SAAS,CAAC,EAAE;oBAC7E,OAAO,6BAA+B,CAAC;iBAC1C;gBACD,mFAAmF;gBACnF,wEAAwE;gBACxE,oDAAoD;gBACpD,wCAAwC;qBACnC;oBACD,OAAO,4CAAuD,CAAC;iBAClE;aACJ;YAED,yEAAyE;iBACpE;gBACD,OAAO,SAAS,CAAC;aACpB;SACJ;aAAM,IAAI,qBAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,iBAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC7F,OAAO,6BAA+B,CAAC;SAC1C;aAAM;YACH,OAAO,kBAAO,CAAC,sBAAsB,CAAC;SACzC;KACJ;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAjDD,gGAiDC"}
1
+ {"version":3,"file":"autocompleteKeywordErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAA6F;AAC7F,sFAAmG;AAInG,gCAAyC;AAGzC,SAAgB,0CAA0C,CACtD,KAAsC;IAEtC,MAAM,QAAQ,GAAa,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,MAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IACpC,MAAM,iBAAiB,GAA8B,KAAK,CAAC,kBAAkB,CAAC;IAE9E,MAAM,wBAAwB,GAAuB,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;IAEpF,IAAI,wBAAwB,KAAK,CAAC,EAAE;QAChC,OAAO,iBAAyB,CAAC;KACpC;SAAM,IAAI,wBAAwB,KAAK,CAAC,EAAE;QACvC,sCAAsC;QACtC,mFAAmF;QACnF,IAAI,iBAAiB,KAAK,SAAS,EAAE;YACjC,MAAM,aAAa,GAAkB,iBAAiB,CAAC;YAEvD,8DAA8D;YAC9D,IACI,aAAa,CAAC,IAAI,kCAA+B;gBACjD,iBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,EAC/D;gBACE,MAAM,SAAS,GAAW,iBAAiB,CAAC,IAAI,CAAC;gBAEjD,iFAAiF;gBACjF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,4BAA8B,UAAU,CAAC,SAAS,CAAC,EAAE;oBAC7E,OAAO,6BAA+B,CAAC;iBAC1C;gBACD,mFAAmF;gBACnF,wEAAwE;gBACxE,oDAAoD;gBACpD,wCAAwC;qBACnC;oBACD,OAAO,4CAAuD,CAAC;iBAClE;aACJ;YAED,yEAAyE;iBACpE;gBACD,OAAO,SAAS,CAAC;aACpB;SACJ;aAAM,IAAI,qBAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,iBAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC7F,OAAO,6BAA+B,CAAC;SAC1C;aAAM;YACH,OAAO,kBAAO,CAAC,sBAAsB,CAAC;SACzC;KACJ;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAjDD,gGAiDC"}
@@ -1,4 +1,5 @@
1
1
  import * as PQP from "@microsoft/powerquery-parser";
2
+ import { NodeIdMap } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
2
3
  import { TMaybeActiveNode } from "../activeNode";
3
- import { TriedAutocompleteLanguageConstant } from "./commonTypes";
4
- export declare function tryAutocompleteLanguageConstant(settings: PQP.CommonSettings, maybeActiveNode: TMaybeActiveNode): TriedAutocompleteLanguageConstant;
4
+ import { TrailingToken, TriedAutocompleteLanguageConstant } from "./commonTypes";
5
+ export declare function tryAutocompleteLanguageConstant(settings: PQP.CommonSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeActiveNode: TMaybeActiveNode, maybeTrailingToken: TrailingToken | undefined): TriedAutocompleteLanguageConstant;
@@ -9,19 +9,22 @@ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
9
9
  const activeNode_1 = require("../activeNode");
10
10
  const autocompleteItem_1 = require("./autocompleteItem");
11
11
  const __1 = require("../..");
12
- function tryAutocompleteLanguageConstant(settings, maybeActiveNode) {
12
+ function tryAutocompleteLanguageConstant(settings, nodeIdMapCollection, maybeActiveNode, maybeTrailingToken) {
13
13
  const trace = settings.traceManager.entry("LanguageConstant" /* AutocompleteLanguageConstant */, tryAutocompleteLanguageConstant.name, settings.maybeInitialCorrelationId);
14
- const result = powerquery_parser_1.ResultUtils.ensureResult(() => autocompleteLanguageConstant(maybeActiveNode), settings.locale);
14
+ const result = powerquery_parser_1.ResultUtils.ensureResult(() => autocompleteLanguageConstant(nodeIdMapCollection, maybeActiveNode, maybeTrailingToken), settings.locale);
15
15
  trace.exit({ ["IsError" /* IsError */]: powerquery_parser_1.ResultUtils.isError(result) });
16
16
  return result;
17
17
  }
18
18
  exports.tryAutocompleteLanguageConstant = tryAutocompleteLanguageConstant;
19
- function autocompleteLanguageConstant(maybeActiveNode) {
19
+ function autocompleteLanguageConstant(nodeIdMapCollection, maybeActiveNode, maybeTrailingToken) {
20
20
  if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
21
21
  return undefined;
22
22
  }
23
23
  const activeNode = maybeActiveNode;
24
- if (isNullableAllowed(activeNode)) {
24
+ if (isCatchAllowed(nodeIdMapCollection, activeNode, maybeTrailingToken)) {
25
+ return autocompleteItem_1.AutocompleteItemUtils.createFromLanguageConstant("catch" /* Catch */);
26
+ }
27
+ else if (isNullableAllowed(activeNode)) {
25
28
  return autocompleteItem_1.AutocompleteItemUtils.createFromLanguageConstant("nullable" /* Nullable */);
26
29
  }
27
30
  else if (isOptionalAllowed(activeNode)) {
@@ -31,6 +34,25 @@ function autocompleteLanguageConstant(maybeActiveNode) {
31
34
  return undefined;
32
35
  }
33
36
  }
37
+ function isCatchAllowed(nodeIdMapCollection, activeNode, maybeTrailingToken) {
38
+ const ancestry = activeNode.ancestry;
39
+ const numAncestors = ancestry.length;
40
+ for (let index = 0; index < numAncestors; index += 1) {
41
+ const xorNode = ancestry[index];
42
+ if (
43
+ // We are under an ErrorHandlingExpression
44
+ xorNode.node.kind === "ErrorHandlingExpression" /* ErrorHandlingExpression */ &&
45
+ // Which was fully parsed
46
+ parser_1.XorNodeUtils.isAstXor(xorNode) &&
47
+ // Yet the cursor is after the end of the Ast
48
+ activeNode.leafKind === "AfterAstNode" /* AfterAstNode */ &&
49
+ // And it only has two children, meaning it hasn't parsed an error handler
50
+ parser_1.NodeIdMapUtils.assertGetChildren(nodeIdMapCollection.childIdsById, xorNode.node.id).length === 2) {
51
+ return maybeTrailingToken ? "catch" /* Catch */.startsWith(maybeTrailingToken.data) : true;
52
+ }
53
+ }
54
+ return false;
55
+ }
34
56
  function isNullableAllowed(activeNode) {
35
57
  const ancestry = activeNode.ancestry;
36
58
  const numAncestors = ancestry.length;
@@ -1 +1 @@
1
- {"version":3,"file":"autocompleteLanguageConstant.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"autocompleteLanguageConstant.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.ts"],"names":[],"mappings":"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"}
@@ -33,7 +33,7 @@ function autocomplete(settings, parseState, typeCache, maybeActiveNode, maybePar
33
33
  }
34
34
  const triedFieldAccess = yield (0, autocompleteFieldAccess_1.tryAutocompleteFieldAccess)(updatedSettings, parseState, maybeActiveNode, typeCache);
35
35
  const triedKeyword = yield (0, autocompleteKeyword_1.tryAutocompleteKeyword)(updatedSettings, nodeIdMapCollection, maybeActiveNode, maybeTrailingToken);
36
- const triedLanguageConstant = (0, autocompleteLanguageConstant_1.tryAutocompleteLanguageConstant)(updatedSettings, maybeActiveNode);
36
+ const triedLanguageConstant = (0, autocompleteLanguageConstant_1.tryAutocompleteLanguageConstant)(updatedSettings, nodeIdMapCollection, maybeActiveNode, maybeTrailingToken);
37
37
  const triedPrimitiveType = (0, autocompletePrimitiveType_1.tryAutocompletePrimitiveType)(updatedSettings, maybeActiveNode, maybeTrailingToken);
38
38
  trace.exit();
39
39
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAapD,qCAA+C;AAG/C,uEAAuE;AACvE,mFAAmF;AACnF,iFAAiF;AACjF,2EAA2E;AAG3E,uEAAuE;AACvE,SAAsB,YAAY,CAC9B,QAA4B,EAC5B,UAAiC,EACjC,SAAoB,EACpB,eAAiC,EACjC,eAA6D;;QAE7D,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,oCAE5C,YAAY,CAAC,IAAI,EACjB,QAAQ,CAAC,yBAAyB,CACrC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,mBAAmB,GAAyB,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAE9F,IAAI,kBAA6C,CAAC;QAElD,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,MAAM,oBAAoB,GAAyC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CACnG,eAAe,CAAC,UAAU,CAC7B,CAAC;YAEF,IAAI,oBAAoB,KAAK,SAAS,EAAE;gBACpC,kBAAkB,GAAG,IAAA,4BAAmB,EAAC,eAAe,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;aAC5F;SACJ;QAED,MAAM,gBAAgB,GAAiC,MAAM,IAAA,oDAA0B,EACnF,eAAe,EACf,UAAU,EACV,eAAe,EACf,SAAS,CACZ,CAAC;QAEF,MAAM,YAAY,GAA6B,MAAM,IAAA,4CAAsB,EACvE,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,kBAAkB,CACrB,CAAC;QAEF,MAAM,qBAAqB,GAAsC,IAAA,8DAA+B,EAC5F,eAAe,EACf,eAAe,CAClB,CAAC;QAEF,MAAM,kBAAkB,GAAmC,IAAA,wDAA4B,EACnF,eAAe,EACf,eAAe,EACf,kBAAkB,CACrB,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO;YACH,gBAAgB;YAChB,YAAY;YACZ,qBAAqB;YACrB,kBAAkB;SACrB,CAAC;IACN,CAAC;CAAA;AAjED,oCAiEC"}
1
+ {"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAapD,qCAA+C;AAG/C,uEAAuE;AACvE,mFAAmF;AACnF,iFAAiF;AACjF,2EAA2E;AAG3E,uEAAuE;AACvE,SAAsB,YAAY,CAC9B,QAA4B,EAC5B,UAAiC,EACjC,SAAoB,EACpB,eAAiC,EACjC,eAA6D;;QAE7D,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,oCAE5C,YAAY,CAAC,IAAI,EACjB,QAAQ,CAAC,yBAAyB,CACrC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,mBAAmB,GAAyB,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAE9F,IAAI,kBAA6C,CAAC;QAElD,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,MAAM,oBAAoB,GAAyC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CACnG,eAAe,CAAC,UAAU,CAC7B,CAAC;YAEF,IAAI,oBAAoB,KAAK,SAAS,EAAE;gBACpC,kBAAkB,GAAG,IAAA,4BAAmB,EAAC,eAAe,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;aAC5F;SACJ;QAED,MAAM,gBAAgB,GAAiC,MAAM,IAAA,oDAA0B,EACnF,eAAe,EACf,UAAU,EACV,eAAe,EACf,SAAS,CACZ,CAAC;QAEF,MAAM,YAAY,GAA6B,MAAM,IAAA,4CAAsB,EACvE,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,kBAAkB,CACrB,CAAC;QAEF,MAAM,qBAAqB,GAAsC,IAAA,8DAA+B,EAC5F,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,kBAAkB,CACrB,CAAC;QAEF,MAAM,kBAAkB,GAAmC,IAAA,wDAA4B,EACnF,eAAe,EACf,eAAe,EACf,kBAAkB,CACrB,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO;YACH,gBAAgB;YAChB,YAAY;YACZ,qBAAqB;YACrB,kBAAkB;SACrB,CAAC;IACN,CAAC;CAAA;AAnED,oCAmEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@microsoft/powerquery-language-services",
3
- "version": "0.3.26",
3
+ "version": "0.3.27",
4
4
  "author": "Microsoft",
5
5
  "license": "MIT",
6
6
  "scripts": {