@microsoft/powerquery-language-services 1.1.0 → 1.1.2

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.
@@ -90,8 +90,25 @@ function functionDefinition(label, description, asType, completionItemKind, para
90
90
  };
91
91
  }
92
92
  function getDefinition(libraryDefinitions, identifierLiteral) {
93
- return (libraryDefinitions.staticLibraryDefinitions.get(identifierLiteral) ??
94
- libraryDefinitions.dynamicLibraryDefinitions().get(identifierLiteral));
93
+ const identifiers = new Set([
94
+ identifierLiteral,
95
+ ...language_1.IdentifierUtils.getAllowedIdentifiers(identifierLiteral),
96
+ ]);
97
+ // Resolve aliases within each library so static definitions retain precedence.
98
+ for (const identifier of identifiers) {
99
+ const definition = libraryDefinitions.staticLibraryDefinitions.get(identifier);
100
+ if (definition !== undefined) {
101
+ return definition;
102
+ }
103
+ }
104
+ const dynamicDefinitions = libraryDefinitions.dynamicLibraryDefinitions();
105
+ for (const identifier of identifiers) {
106
+ const definition = dynamicDefinitions.get(identifier);
107
+ if (definition !== undefined) {
108
+ return definition;
109
+ }
110
+ }
111
+ return undefined;
95
112
  }
96
113
  function getKeys(libraryDefinitions) {
97
114
  return [
@@ -1 +1 @@
1
- {"version":3,"file":"libraryDefinitionUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/library/libraryDefinitionUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAqBlC,4CAIC;AAED,4CAIC;AAED,oCAIC;AAED,4CAIC;AAED,4CAIC;AAED,oCAIC;AAED,gDAaC;AAED,oDAyBC;AAED,gDAeC;AAED,sCAQC;AAED,0BAKC;AAED,sCAEC;AAED,gCAEC;AAED,gCAEC;AAED,wBAEC;AAED,oDAMC;AAED,oDAOC;AAlKD,6EAKqC;AACrC,0FAAmF;AAEnF,+DAAsH;AACtH,uCAQmB;AAEnB,SAAgB,gBAAgB,CAAC,UAA0C;IACvE,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAE7B,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAgB,gBAAgB,CAAC,UAA0C;IACvE,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAE7B,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAgB,YAAY,CAAC,UAA0C;IACnE,YAAY,CAAC,UAAU,CAAC,CAAC;IAEzB,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAgB,gBAAgB,CAAC,UAA0C;IACvE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,6BAA6B,+BAAqB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnF,CAAC;AACL,CAAC;AAED,SAAgB,gBAAgB,CAAC,UAA0C;IACvE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,6BAA6B,+BAAqB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnF,CAAC;AACL,CAAC;AAED,SAAgB,YAAY,CAAC,UAA0C;IACnE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,6BAA6B,+BAAqB,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/E,CAAC;AACL,CAAC;AAED,SAAgB,kBAAkB,CAC9B,KAAa,EACb,WAAmB,EACnB,MAA4B,EAC5B,kBAAsC;IAEtC,OAAO;QACH,IAAI,EAAE,+BAAqB,CAAC,QAAQ;QACpC,gBAAgB,EAAE,MAAM;QACxB,kBAAkB;QAClB,WAAW;QACX,KAAK;KACR,CAAC;AACN,CAAC;AAED,SAAgB,oBAAoB,CAAC,kBAAsC;IACvE,OAAO,CAAC,OAA6B,EAAoC,EAAE;QACvE,MAAM,UAAU,GAAmC,aAAa,CAAC,kBAAkB,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAEhH,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,MAAM,gBAAgB,GAAyB,UAAU,CAAC,gBAAgB,CAAC;QAE3E,qEAAqE;QACrE,IAAI,OAAO,CAAC,IAAI,KAAK,sCAAuB,CAAC,UAAU,EAAE,CAAC;YACtD,OAAO,gBAAgB,CAAC;QAC5B,CAAC;QAED,qEAAqE;QAErE,oDAAoD;QACpD,IAAI,gBAAgB,CAAC,YAAY,KAAK,eAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC;YAC1E,OAAO,gBAAgB,CAAC,UAAU,CAAC;QACvC,CAAC;QAED,wFAAwF;QACxF,OAAO,eAAI,CAAC,WAAW,CAAC;IAC5B,CAAC,CAAC;AACN,CAAC;AAED,SAAgB,kBAAkB,CAC9B,KAAa,EACb,WAAmB,EACnB,MAA4B,EAC5B,kBAAsC,EACtC,UAA2C;IAE3C,OAAO;QACH,IAAI,EAAE,+BAAqB,CAAC,QAAQ;QACpC,gBAAgB,EAAE,MAAM;QACxB,kBAAkB;QAClB,WAAW;QACX,KAAK;QACL,UAAU;KACb,CAAC;AACN,CAAC;AAED,SAAgB,aAAa,CACzB,kBAAsC,EACtC,iBAAyB;IAEzB,OAAO,CACH,kBAAkB,CAAC,wBAAwB,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAClE,kBAAkB,CAAC,yBAAyB,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,CACxE,CAAC;AACN,CAAC;AAED,SAAgB,OAAO,CAAC,kBAAsC;IAC1D,OAAO;QACH,GAAG,kBAAkB,CAAC,wBAAwB,CAAC,IAAI,EAAE;QACrD,GAAG,kBAAkB,CAAC,yBAAyB,EAAE,CAAC,IAAI,EAAE;KAC3D,CAAC;AACN,CAAC;AAED,SAAgB,aAAa,CAAC,kBAAsC,EAAE,GAAW;IAC7E,OAAO,aAAa,CAAC,kBAAkB,EAAE,GAAG,CAAC,KAAK,SAAS,CAAC;AAChE,CAAC;AAED,SAAgB,UAAU,CAAC,UAA0C;IACjE,OAAO,UAAU,EAAE,IAAI,KAAK,+BAAqB,CAAC,QAAQ,CAAC;AAC/D,CAAC;AAED,SAAgB,UAAU,CAAC,UAA0C;IACjE,OAAO,UAAU,EAAE,IAAI,KAAK,+BAAqB,CAAC,QAAQ,CAAC;AAC/D,CAAC;AAED,SAAgB,MAAM,CAAC,UAA0C;IAC7D,OAAO,UAAU,EAAE,IAAI,KAAK,+BAAqB,CAAC,IAAI,CAAC;AAC3D,CAAC;AAED,SAAgB,oBAAoB,CAAC,wBAAyC;IAC1E,OAAO;QACH,KAAK,EAAE,wBAAwB,CAAC,KAAK;QACrC,aAAa,EAAE,wBAAwB,CAAC,WAAW;QACnD,UAAU,EAAE,wBAAwB,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC;KAC5E,CAAC;AACN,CAAC;AAED,SAAgB,oBAAoB,CAAC,gBAAkC;IACnE,OAAO;QACH,KAAK,EAAE,gBAAgB,CAAC,KAAK;QAC7B,aAAa,EAAE,gBAAgB,CAAC,aAAa;YACzC,CAAC,CAAC,EAAE,IAAI,EAAE,wCAAU,CAAC,QAAQ,EAAE,KAAK,EAAE,gBAAgB,CAAC,aAAa,EAAE;YACtE,CAAC,CAAC,SAAS;KAClB,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"libraryDefinitionUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/library/libraryDefinitionUtils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@microsoft/powerquery-language-services",
3
- "version": "1.1.0",
3
+ "version": "1.1.2",
4
4
  "author": "Microsoft",
5
5
  "license": "MIT",
6
6
  "scripts": {
@@ -56,7 +56,7 @@
56
56
  "webpack": "^5.105.1"
57
57
  },
58
58
  "dependencies": {
59
- "@microsoft/powerquery-formatter": "1.0.0",
59
+ "@microsoft/powerquery-formatter": "^1.0.1",
60
60
  "@microsoft/powerquery-parser": "2.0.0",
61
61
  "vscode-languageserver-textdocument": "1.0.12",
62
62
  "vscode-languageserver-types": "3.17.5"