@usethesource/rascal-vscode-dsl-lsp-server 0.6.0 → 0.6.1

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 (12) hide show
  1. package/assets/jars/rascal-lsp.jar +0 -0
  2. package/assets/jars/rascal.jar +0 -0
  3. package/lib/auto-jvm/JavaLookup.js +12 -11
  4. package/lib/auto-jvm/JavaLookup.js.map +1 -1
  5. package/lib/auto-jvm/downloaders.js +1 -1
  6. package/lib/auto-jvm/downloaders.js.map +1 -1
  7. package/lib/extension.js +2 -0
  8. package/lib/extension.js.map +1 -1
  9. package/lib/ux/RascalMFValidator.d.ts +11 -0
  10. package/lib/ux/RascalMFValidator.js +211 -0
  11. package/lib/ux/RascalMFValidator.js.map +1 -0
  12. package/package.json +1 -1
package/assets/jars/rascal-lsp.jar CHANGED
Binary file
package/assets/jars/rascal.jar CHANGED
Binary file
package/lib/auto-jvm/JavaLookup.js CHANGED
@@ -35,8 +35,9 @@ const downloaders_1 = require("./downloaders");
35
35
  const fs_1 = require("fs");
36
36
  const util_1 = require("util");
37
37
  const currentJVMEngineMin = 11;
38
- const currentJVMEngineMax = 11;
39
- const mainJVMPath = path.join(os.homedir(), ".jvm", `jdk${currentJVMEngineMax}`);
38
+ const currentJVMEngineMax = 17;
39
+ const currentPreferredJVMEngine = 11;
40
+ const mainJVMPath = path.join(os.homedir(), ".jvm", `jdk${currentPreferredJVMEngine}`);
40
41
  let lookupCompleted;
41
42
  const pexec = (0, util_1.promisify)(cp.exec);
42
43
  async function getJavaExecutable() {
@@ -108,9 +109,9 @@ function getJavaCandidates() {
108
109
  }
109
110
  async function askUserForJVM() {
110
111
  const selfInstall = "Install myself & restart vscode";
111
- const extensionInstall = `Automatically download Java ${currentJVMEngineMax} `;
112
+ const extensionInstall = `Automatically download Java ${currentPreferredJVMEngine} `;
112
113
  const configurePath = "Configure JDK path";
113
- const opt = await vscode.window.showErrorMessage(`Rascal (or a DSL that uses Rascal) requires a Java ${currentJVMEngineMax} runtime. Shall we download it, or will you set it up yourself?`, { modal: true }, selfInstall, extensionInstall, configurePath);
114
+ const opt = await vscode.window.showErrorMessage(`Rascal (or a DSL that uses Rascal) requires at least Java ${currentJVMEngineMin} runtime (max ${currentJVMEngineMax}). Shall we download it, or will you set it up yourself?`, { modal: true }, selfInstall, extensionInstall, configurePath);
114
115
  if (opt === extensionInstall) {
115
116
  return startAutoInstall();
116
117
  }
@@ -139,7 +140,7 @@ async function startAutoInstall() {
139
140
  await vscode.env.openExternal(vscode.Uri.parse(url));
140
141
  return startAutoInstall();
141
142
  }
142
- throw new Error("User setup required for jdk 11");
143
+ throw new Error(`User setup required for jdk ${currentJVMEngineMin}`);
143
144
  }
144
145
  async function openSettings() {
145
146
  await vscode.commands.executeCommand('workbench.action.openSettings', '@ext:rascalmpl');
@@ -150,13 +151,13 @@ async function downloadJDK() {
150
151
  const msJava = "Microsoft Build of OpenJDK";
151
152
  const amazon = "Amazon Corretto";
152
153
  let options = [];
153
- if ((0, downloaders_1.temurinSupported)(currentJVMEngineMax)) {
154
+ if ((0, downloaders_1.temurinSupported)(currentPreferredJVMEngine)) {
154
155
  options.push(temurin);
155
156
  }
156
- if ((0, downloaders_1.microsoftSupported)(currentJVMEngineMax)) {
157
+ if ((0, downloaders_1.microsoftSupported)(currentPreferredJVMEngine)) {
157
158
  options.push(msJava);
158
159
  }
159
- if ((0, downloaders_1.correttoSupported)(currentJVMEngineMax)) {
160
+ if ((0, downloaders_1.correttoSupported)(currentPreferredJVMEngine)) {
160
161
  options.push(amazon);
161
162
  }
162
163
  const choice = await vscode.window.showInformationMessage("Select which OpenJDK provider you prefer", { modal: true }, ...options);
@@ -169,9 +170,9 @@ async function downloadJDK() {
169
170
  progress.report({ message: message, increment: percIncrement });
170
171
  }
171
172
  switch (choice) {
172
- case temurin: return (0, downloaders_1.downloadTemurin)(mainJVMPath, currentJVMEngineMax, actualProgress);
173
- case msJava: return (0, downloaders_1.downloadMicrosoftJDK)(mainJVMPath, currentJVMEngineMax, actualProgress);
174
- case amazon: return (0, downloaders_1.downloadCorretto)(mainJVMPath, currentJVMEngineMax, actualProgress);
173
+ case temurin: return (0, downloaders_1.downloadTemurin)(mainJVMPath, currentPreferredJVMEngine, actualProgress);
174
+ case msJava: return (0, downloaders_1.downloadMicrosoftJDK)(mainJVMPath, currentPreferredJVMEngine, actualProgress);
175
+ case amazon: return (0, downloaders_1.downloadCorretto)(mainJVMPath, currentPreferredJVMEngine, actualProgress);
175
176
  default: throw new Error("User setup required");
176
177
  }
177
178
  });
package/lib/auto-jvm/JavaLookup.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"JavaLookup.js","sourceRoot":"","sources":["../../src/auto-jvm/JavaLookup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JavaLookup.js","sourceRoot":"","sources":["../../src/auto-jvm/JavaLookup.ts"],"names":[],"mappings":"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"}
package/lib/auto-jvm/downloaders.js CHANGED
@@ -45,7 +45,7 @@ function temurinSupported(jdkVersion) {
45
45
  case 'arm64':
46
46
  switch (os.platform()) {
47
47
  case 'linux': return true;
48
- case 'darwin': return jdkVersion === 17;
48
+ case 'darwin': return true;
49
49
  default: return false;
50
50
  }
51
51
  default: return false;
package/lib/auto-jvm/downloaders.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"downloaders.js","sourceRoot":"","sources":["../../src/auto-jvm/downloaders.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,yBAAyB;AACzB,6BAA6B;AAC7B,2CAA6C;AAC7C,2BAA2B;AAC3B,mCAA2C;AAC3C,+BAA+B;AAC/B,yBAAyB;AACzB,0CAAoC;AACpC,+BAA+B;AA6B/B,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,iBAAQ,CAAC,CAAC;AAEtC,SAAgB,gBAAgB,CAAC,UAAkB;IAC/C,QAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QACd,KAAK,KAAK,CAAC,CAAC,OAAO,IAAI,CAAC;QACxB,KAAK,KAAK,CAAC,CAAC,OAAO,IAAI,CAAC;QACxB,KAAK,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC;QAC7C,KAAK,OAAO;YACR,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACnB,KAAK,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC;gBAC1B,KAAK,QAAQ,CAAC,CAAC,OAAO,UAAU,KAAK,EAAE,CAAC;gBACxC,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC;aACzB;QACL,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC;KACzB;AACL,CAAC;AAbD,4CAaC;AAED,SAAgB,iBAAiB,CAAC,UAAkB;IAChD,QAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QACd,KAAK,KAAK,CAAC,CAAC,OAAO,IAAI,CAAC;QACxB,KAAK,KAAK,CAAC,CAAC,OAAO,IAAI,CAAC;QACxB,KAAK,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,IAAI,UAAU,KAAK,EAAE,CAAC;QAClE,KAAK,OAAO;YACR,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACnB,KAAK,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC;gBAC1B,KAAK,QAAQ,CAAC,CAAC,OAAO,UAAU,KAAK,EAAE,CAAC;gBACxC,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC;aACzB;QACL,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC;KACzB;AACL,CAAC;AAbD,8CAaC;AAED,SAAgB,kBAAkB,CAAC,UAAkB;IACjD,IAAI,UAAU,KAAK,CAAC,EAAE;QAClB,OAAO,KAAK,CAAC;KAChB;IACD,QAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QACd,KAAK,KAAK,CAAC,CAAC,OAAO,IAAI,CAAC;QACxB,KAAK,KAAK,CAAC,CAAC,OAAO,IAAI,CAAC;QACxB,KAAK,OAAO;YACR,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACnB,KAAK,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC;gBAC1B,KAAK,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC;gBAC1B,KAAK,QAAQ,CAAC,CAAC,OAAO,UAAU,KAAK,EAAE,CAAC;gBACxC,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC;aACzB;QACL,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC;KACzB;AACL,CAAC;AAhBD,gDAgBC;AAGM,KAAK,UAAU,eAAe,CAAC,WAAmB,EAAE,UAAkB,EAAE,QAAsB;IACjG,MAAM,UAAU,GAAG,MAAM,+BAA+B,CAAC,UAAU,CAAC,CAAC;IAErE,MAAM,IAAI,GAAG,uBAAuB,EAAE,CAAC;IACvC,IAAI,QAA0B,CAAC;IAC/B,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,6DAA6D;QAClF,KAAK,QAAQ;YAAE,QAAQ,GAAC,KAAK,CAAC;YAAC,MAAM;QACrC,KAAK,OAAO;YAAE,QAAQ,GAAG,OAAO,CAAC;YAAE,MAAM;QACzC,KAAK,OAAO;YAAE,QAAQ,GAAG,SAAS,CAAC;YAAE,MAAM;QAC3C,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;KACtE;IACD,OAAO,qBAAqB,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;AACpF,CAAC;AAZD,0CAYC;AAEM,KAAK,UAAU,gBAAgB,CAAC,WAAmB,EAAE,UAAkB,EAAE,QAAsB;IAClG,MAAM,IAAI,GAAG,uBAAuB,EAAE,CAAC;IACvC,IAAI,QAA2B,CAAC;IAChC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,6DAA6D;QAClF,KAAK,QAAQ;YAAE,QAAQ,GAAC,OAAO,CAAC;YAAC,MAAM;QACvC,KAAK,OAAO;YAAE,QAAQ,GAAG,OAAO,CAAC;YAAE,MAAM;QACzC,KAAK,OAAO;YAAE,QAAQ,GAAG,SAAS,CAAC;YAAE,MAAM;QAC3C,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;KACtE;IAED,OAAO,sBAAsB,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;AACrF,CAAC;AAXD,4CAWC;AAIM,KAAK,UAAU,oBAAoB,CAAC,WAAmB,EAAE,UAAkB,EAAE,QAAsB;IACtG,IAAI,IAAqB,CAAC;IAC1B,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,6EAA6E;QAC9F,KAAK,OAAO;YAAE,IAAI,GAAG,SAAS,CAAC;YAAC,MAAM;QACtC,KAAK,KAAK,CAAC,CAAC,mEAAmE;QAC/E,KAAK,KAAK;YAAE,IAAI,GAAG,KAAK,CAAC;YAAC,MAAM;QAChC,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;KACtE;IACD,IAAI,QAAqB,CAAC;IAC1B,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,6DAA6D;QAClF,KAAK,QAAQ;YAAE,QAAQ,GAAC,OAAO,CAAC;YAAC,MAAM;QACvC,KAAK,OAAO;YAAE,QAAQ,GAAG,OAAO,CAAC;YAAE,MAAM;QACzC,KAAK,OAAO;YAAE,QAAQ,GAAG,SAAS,CAAC;YAAE,MAAM;QAC3C,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;KACtE;IACD,OAAO,0BAA0B,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;AAEzF,CAAC;AAjBD,oDAiBC;AAGD,uCAAuC;AAChC,KAAK,UAAU,+BAA+B,CAAC,OAAe;IACjE,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,OAAO,MAAM,OAAO,OAAO,CAAC,CAAC;IACzE,MAAM,WAAW,GAAG,MAAM,IAAA,oBAAK,EAAC,sNAAsN,YAAY,EAAE,CAAC,CAAC;IAEtQ,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,uBAAuB,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC;KACpE;IAED,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,EAAsB,CAAC;IAC9D,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KACpD;IACD,MAAM,GAAG,GAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,OAAO,KAAK,CAAC,EAAE;QACf,OAAO,QAAQ,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;KAC3E;IACD,OAAO,OAAO,GAAG,CAAC,eAAe,EAAE,CAAC;AACxC,CAAC;AAjBD,0EAiBC;AAED,SAAS,uBAAuB;IAC5B,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,6EAA6E;QAC9F,KAAK,KAAK,CAAC,CAAC,OAAO,KAAK,CAAC;QACzB,KAAK,OAAO,CAAC,CAAC,OAAO,SAAS,CAAC;QAC/B,KAAK,KAAK,CAAC,CAAC,mEAAmE;QAC/E,KAAK,KAAK,CAAC,CAAC,OAAO,KAAK,CAAC;QACzB,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;KACtE;AACL,CAAC;AAGM,KAAK,UAAU,0BAA0B,CAAC,IAAqB,EAAE,QAAqB,EAAE,UAAkB,EAAE,WAAmB,EAAE,QAAsB;IAC1J,gEAAgE;IAChE,MAAM,GAAG,GAAG,6CAA6C,UAAU,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACvI,QAAQ,QAAQ,EAAE;QACd,KAAK,SAAS,CAAC,CAAC,OAAO,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QACxG,KAAK,OAAO,CAAC,CAAC,OAAO,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;QACnH,KAAK,OAAO,CAAC,CAAC,OAAO,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC5F,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;KACtB;AACL,CAAC;AATD,gEASC;AAEM,KAAK,UAAU,sBAAsB,CAAC,IAA2B,EAAE,QAA2B,EAAE,UAAkB,EAAE,WAAmB,EAAE,QAAsB;IAClK,mIAAmI;IACnI,gFAAgF;IAChF,MAAM,GAAG,GAAG,yDAAyD,UAAU,IAAI,IAAI,IAAI,QAAQ,QAAQ,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACvJ,QAAQ,QAAQ,EAAE;QACd,KAAK,SAAS,CAAC,CAAC,OAAO,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QACxG,KAAK,OAAO,CAAC,CAAC,OAAO,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAChH,KAAK,OAAO,CAAC,CAAC,OAAO,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC5F,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;KACtB;AACL,CAAC;AAVD,wDAUC;AAGM,KAAK,UAAU,qBAAqB,CAAC,IAA0B,EAAE,QAA0B,EAAE,YAAoB,EAAE,WAAmB,EAAE,QAAsB;IACjK,8GAA8G;IAC9G,MAAM,GAAG,GAAG,8CAA8C,kBAAkB,CAAC,YAAY,CAAC,IAAI,QAAQ,IAAI,IAAI,yCAAyC,CAAC;IACxJ,QAAQ,QAAQ,EAAE;QACd,KAAK,SAAS,CAAC,CAAC,OAAO,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QACxG,KAAK,KAAK,CAAC,CAAC,OAAO,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC9G,KAAK,OAAO,CAAC,CAAC,OAAO,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC5F,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;KACtB;AACL,CAAC;AATD,sDASC;AAED,SAAS;AACT,KAAK,UAAU,gBAAgB,CAAC,GAAW,EAAE,OAAe,EAAE,WAAmB,EAAE,QAAsB,EAAE,KAAK,GAAG,CAAC;IAChH,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,CAAC,CAAC;IAClC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;KACjE;IACD,MAAM,IAAA,gBAAK,EAAC,WAAW,EAAE,EAAE,SAAS,EAAG,IAAI,EAAE,CAAC,CAAC;IAC/C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;YAChB,MAAM,CAAC,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;SAC/C;QACD,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,CAAC;QACnE,IAAA,iBAAQ,EAAC,QAAQ,CAAC,IAAI,EAClB,IAAI,kBAAS,CAAC;YACV,SAAS,EAAE,UAAU,KAAK,EAAE,QAAQ,EAAE,QAAQ;gBAC1C,QAAQ,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,gCAAgC,CAAC,CAAC;gBACxE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACjB,QAAQ,EAAE,CAAC;YACf,CAAC;SACJ,CAAC,EACF,GAAG,CAAC,OAAO,CAAC;YACR,GAAG,EAAE,WAAW;YAChB,KAAK,EAAE,KAAK;YACZ,OAAO,EAAE,CAAC,CAAC,EAAE;gBACT,IAAI,CAAC,gBAAgB,KAAK,EAAE,IAAI,gBAAgB,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;oBAClE,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;iBAC/C;YACL,CAAC;SACJ,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE;YAAE,MAAM,CAAC,CAAC,CAAC,CAAC;SAAC,CAAA,CAAC,CAC/B,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACf,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;YACzD,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YACzE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE;YACb,MAAM,CAAC,CAAC,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;IAEX,CAAC,CAAC,CAAC;AACP,CAAC;AAKD,KAAK,UAAU,cAAc,CAAC,QAAkB,EAAE,QAAsB;IACpE,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,CAAC;IACnE,IAAI,IAAI,KAAK,CAAC,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,IAAI,GAAa,EAAE,CAAC;YAE1B,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC/B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACzB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC9B,QAAQ,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;gBAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;KACN;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACvC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YAC3C,QAAQ,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,iBAAiB,CAAC,CAAC;YACjD,OAAO,IAAI,KAAK,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACzB,OAAO,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9B,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,aAAa,GAAG,IAAA,gBAAS,EAAmD,KAAK,CAAC,UAAU,CAAC,CAAC;AAEpG,oCAAoC;AACpC,KAAK,UAAU,sBAAsB,CAAC,GAAW,EAAE,OAAe,EAAE,WAAmB,EAAE,QAAsB;IAC3G,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,CAAC,CAAC;IAClC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,UAAU,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;KAC3F;IAED,MAAM,eAAe,GAAG,MAAM,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACjE,MAAM,IAAA,gBAAK,EAAC,WAAW,EAAE,EAAE,SAAS,EAAG,IAAI,EAAE,CAAC,CAAC;IAC/C,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;IAC3F,IAAI,CAAC,OAAO,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACzD;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,KAAkB,EAAE,EAAE;YAC7C,QAAQ,CAAC,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;YAExD,IAAI,gBAAgB,KAAK,EAAE,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACzD,gBAAgB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aACnD;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YACxD,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;YACvD,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,sBAAsB,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC;YAC3D,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC5D,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,yBAAyB;gBAC9C,OAAO;aACV;YACD,MAAM,UAAU,GAAG,MAAM,IAAA,gBAAS,EAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAChF,IAAI,CAAC,UAAU,EAAE;gBACb,MAAM,CAAC,wBAAwB,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAClD,OAAO,CAAC,KAAK,EAAE,CAAC;gBAChB,OAAO;aACV;YACD,MAAM,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAI5D,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,yBAAyB;QAClD,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACnB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;YACzD,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YACzE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,cAAc;IACvC,CAAC,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"downloaders.js","sourceRoot":"","sources":["../../src/auto-jvm/downloaders.ts"],"names":[],"mappings":"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"}
package/lib/extension.js CHANGED
@@ -29,12 +29,14 @@ exports.deactivate = exports.activate = void 0;
29
29
  */
30
30
  const path = require("path");
31
31
  const RascalExtension_1 = require("./RascalExtension");
32
+ const RascalMFValidator_1 = require("./ux/RascalMFValidator");
32
33
  const testDeployMode = (process.env.RASCAL_LSP_DEV_DEPLOY || "false") === "true";
33
34
  const deployMode = (process.env.RASCAL_LSP_DEV || "false") !== "true";
34
35
  function activate(context) {
35
36
  const jars = context.asAbsolutePath(path.join('.', 'assets', 'jars'));
36
37
  const extension = new RascalExtension_1.RascalExtension(context, jars, (deployMode || testDeployMode));
37
38
  context.subscriptions.push(extension);
39
+ context.subscriptions.push(new RascalMFValidator_1.RascalMFValidator());
38
40
  return extension.externalLanguageRegistry();
39
41
  }
40
42
  exports.activate = activate;
package/lib/extension.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,6BAA6B;AAG7B,uDAAoD;AAEpD,MAAM,cAAc,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,OAAO,CAAC,KAAK,MAAM,CAAC;AACjF,MAAM,UAAU,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,KAAK,MAAM,CAAC;AAGtE,SAAgB,QAAQ,CAAC,OAAgC;IACrD,MAAM,IAAI,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACtE,MAAM,SAAS,GAAG,IAAI,iCAAe,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,CAAC;IACrF,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACtC,OAAO,SAAS,CAAC,wBAAwB,EAAE,CAAC;AAChD,CAAC;AALD,4BAKC;AAGD,SAAgB,UAAU,KAAI,CAAC;AAA/B,gCAA+B"}
1
+ {"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,6BAA6B;AAG7B,uDAAoD;AACpD,8DAA2D;AAE3D,MAAM,cAAc,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,OAAO,CAAC,KAAK,MAAM,CAAC;AACjF,MAAM,UAAU,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,KAAK,MAAM,CAAC;AAGtE,SAAgB,QAAQ,CAAC,OAAgC;IACrD,MAAM,IAAI,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACtE,MAAM,SAAS,GAAG,IAAI,iCAAe,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,CAAC;IACrF,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACtC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,qCAAiB,EAAE,CAAC,CAAC;IACpD,OAAO,SAAS,CAAC,wBAAwB,EAAE,CAAC;AAChD,CAAC;AAND,4BAMC;AAGD,SAAgB,UAAU,KAAI,CAAC;AAA/B,gCAA+B"}
package/lib/ux/RascalMFValidator.d.ts ADDED
@@ -0,0 +1,11 @@
1
+ import * as vscode from 'vscode';
2
+ /**
3
+ * Check for common errors in RASCAL.MF files, and try and fix them if possible
4
+ */
5
+ export declare class RascalMFValidator implements vscode.Disposable {
6
+ private readonly diagnostics;
7
+ private readonly toDispose;
8
+ constructor();
9
+ dispose(): void;
10
+ private verifyRascalMF;
11
+ }
package/lib/ux/RascalMFValidator.js ADDED
@@ -0,0 +1,211 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.RascalMFValidator = void 0;
4
+ /*
5
+ * Copyright (c) 2018-2021, NWO-I CWI and Swat.engineering
6
+ * All rights reserved.
7
+ *
8
+ * Redistribution and use in source and binary forms, with or without
9
+ * modification, are permitted provided that the following conditions are met:
10
+ *
11
+ * 1. Redistributions of source code must retain the above copyright notice,
12
+ * this list of conditions and the following disclaimer.
13
+ *
14
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
15
+ * this list of conditions and the following disclaimer in the documentation
16
+ * and/or other materials provided with the distribution.
17
+ *
18
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28
+ * POSSIBILITY OF SUCH DAMAGE.
29
+ */
30
+ const vscode = require("vscode");
31
+ const path_1 = require("path"); // posix path join is always correct, also on windows
32
+ const MF_FILE = "RASCAL.MF";
33
+ const MF_DIR = "META-INF";
34
+ /**
35
+ * Check for common errors in RASCAL.MF files, and try and fix them if possible
36
+ */
37
+ class RascalMFValidator {
38
+ constructor() {
39
+ this.toDispose = [];
40
+ this.diagnostics = vscode.languages.createDiagnosticCollection("Rascal MF Diagnostics");
41
+ // any new project should be checked
42
+ vscode.workspace.onDidChangeWorkspaceFolders(async (ws) => {
43
+ for (const added of ws.added) {
44
+ try {
45
+ const mfURI = buildMFChildPath(added.uri);
46
+ await vscode.workspace.fs.stat(mfURI);
47
+ this.verifyRascalMF(mfURI);
48
+ }
49
+ catch (_missingFile) {
50
+ // most likely not a rascal project
51
+ }
52
+ }
53
+ for (const rem of ws.removed) {
54
+ // clear messages of things no longer in the workspace
55
+ this.diagnostics.delete(buildMFChildPath(rem.uri));
56
+ }
57
+ }, this, this.toDispose);
58
+ // also at the start, check the already opened folders
59
+ for (const openProject of vscode.workspace.workspaceFolders || []) {
60
+ const mfURI = buildMFChildPath(openProject.uri);
61
+ vscode.workspace.fs.stat(mfURI).then(_s => this.verifyRascalMF(mfURI));
62
+ }
63
+ // all changed files should be checked on save (for example a git pull)
64
+ // we use the filesystem watcher since a user might not have the RASCAL.MF open, but we still want to warn them
65
+ // note that warnings/errors are only cleared at a save
66
+ const watcher = vscode.workspace.createFileSystemWatcher("**/" + MF_FILE, true, false, false);
67
+ watcher.onDidChange(this.verifyRascalMF, this, this.toDispose);
68
+ watcher.onDidDelete(e => this.diagnostics.delete(e), this, this.toDispose); // clear errors for a file
69
+ this.toDispose.push(watcher);
70
+ this.toDispose.push(vscode.languages.registerCodeActionsProvider({ pattern: "**/" + MF_FILE }, new FixMFErrors()));
71
+ }
72
+ dispose() {
73
+ try {
74
+ this.diagnostics.dispose();
75
+ }
76
+ catch (_e) { }
77
+ for (const d of this.toDispose) {
78
+ try {
79
+ d.dispose();
80
+ }
81
+ catch (_e) { }
82
+ }
83
+ }
84
+ async verifyRascalMF(file) {
85
+ try {
86
+ const mfBody = await vscode.workspace.openTextDocument(file);
87
+ const diagnostics = [];
88
+ checkMissingLastLine(mfBody, diagnostics);
89
+ checkIncorrectProjectName(mfBody, diagnostics);
90
+ checkCommonTypo(mfBody, diagnostics);
91
+ this.diagnostics.set(file, diagnostics);
92
+ }
93
+ catch (error) {
94
+ }
95
+ }
96
+ }
97
+ exports.RascalMFValidator = RascalMFValidator;
98
+ var FixKind;
99
+ (function (FixKind) {
100
+ FixKind[FixKind["ADD_NEW_LINE"] = 1] = "ADD_NEW_LINE";
101
+ FixKind[FixKind["FIX_PROJECT_NAME"] = 2] = "FIX_PROJECT_NAME";
102
+ FixKind[FixKind["REQUIRE_LIBRARIES_TYPO"] = 3] = "REQUIRE_LIBRARIES_TYPO";
103
+ })(FixKind || (FixKind = {}));
104
+ function checkMissingLastLine(mfBody, diagnostics) {
105
+ const lastLine = mfBody.lineAt(mfBody.lineCount - 1);
106
+ if (lastLine.text !== "") {
107
+ const diag = new vscode.Diagnostic(lastLine.range, `${MF_FILE} should end with a empty newline (no spaces, no comments), else the previous line is ignored`, vscode.DiagnosticSeverity.Error);
108
+ diag.code = FixKind.ADD_NEW_LINE;
109
+ diagnostics.push(diag);
110
+ }
111
+ }
112
+ function checkIncorrectProjectName(mfBody, diagnostics) {
113
+ let hasProjectName = false;
114
+ for (let l = 0; l < mfBody.lineCount; l++) {
115
+ const line = mfBody.lineAt(l);
116
+ const kvPair = line.text.split(":");
117
+ if (kvPair.length === 2 && kvPair[0].trim() === "Project-Name") {
118
+ hasProjectName = true;
119
+ const prName = kvPair[1].split("#")[0].trim();
120
+ const expectedName = calculateProjectName(mfBody.uri);
121
+ if (prName !== expectedName) {
122
+ const offset = line.text.indexOf(prName);
123
+ const targetRange = new vscode.Range(l, offset, l, offset + prName.length);
124
+ const diag = new vscode.Diagnostic(targetRange, `Incorrect project-name, it should equal the directory name (${expectedName})`, vscode.DiagnosticSeverity.Error);
125
+ diag.code = FixKind.FIX_PROJECT_NAME;
126
+ diagnostics.push(diag);
127
+ }
128
+ }
129
+ }
130
+ if (!hasProjectName) {
131
+ diagnostics.push(new vscode.Diagnostic(new vscode.Range(0, 0, 0, 0), "Missing project name, please add a 'Project-Name' property"));
132
+ }
133
+ }
134
+ function checkCommonTypo(mfBody, diagnostics) {
135
+ for (let l = 0; l < mfBody.lineCount; l++) {
136
+ const line = mfBody.lineAt(l);
137
+ const kvPair = line.text.split(":");
138
+ if (kvPair.length >= 2) {
139
+ let fixType = undefined;
140
+ switch (kvPair[0].trim()) {
141
+ case "Required-Libraries":
142
+ fixType = FixKind.REQUIRE_LIBRARIES_TYPO;
143
+ break;
144
+ case "Require-Library":
145
+ fixType = FixKind.REQUIRE_LIBRARIES_TYPO;
146
+ break;
147
+ case "Required-Library":
148
+ fixType = FixKind.REQUIRE_LIBRARIES_TYPO;
149
+ break;
150
+ }
151
+ switch (fixType) {
152
+ case FixKind.REQUIRE_LIBRARIES_TYPO:
153
+ const originalLabel = kvPair[0];
154
+ const diag = new vscode.Diagnostic(new vscode.Range(l, 0, l, originalLabel.length), `"${originalLabel} should be Require-Libraries`);
155
+ diag.code = FixKind.REQUIRE_LIBRARIES_TYPO;
156
+ diagnostics.push(diag);
157
+ }
158
+ }
159
+ }
160
+ }
161
+ function hasNewline(tl) {
162
+ return tl.range.end.character !== tl.rangeIncludingLineBreak.end.character;
163
+ }
164
+ function buildMFChildPath(uri) {
165
+ return uri.with({
166
+ path: path_1.posix.join(uri.path, MF_DIR, MF_FILE)
167
+ });
168
+ }
169
+ class FixMFErrors {
170
+ provideCodeActions(document, range, context, token) {
171
+ const result = [];
172
+ for (const diag of context.diagnostics) {
173
+ switch (diag.code) {
174
+ case FixKind.ADD_NEW_LINE:
175
+ const addNewline = new vscode.CodeAction("Add newline", vscode.CodeActionKind.QuickFix);
176
+ addNewline.diagnostics = [diag];
177
+ addNewline.isPreferred = true;
178
+ addNewline.edit = new vscode.WorkspaceEdit();
179
+ const lastLine = document.lineAt(document.lineCount - 1);
180
+ addNewline.edit.insert(document.uri, lastLine.rangeIncludingLineBreak.end, (document.eol === vscode.EndOfLine.CRLF ? "\r\n" : "\n"));
181
+ result.push(addNewline);
182
+ break;
183
+ case FixKind.FIX_PROJECT_NAME:
184
+ const fixedProjectName = new vscode.CodeAction("Fix project-name", vscode.CodeActionKind.QuickFix);
185
+ fixedProjectName.diagnostics = [diag];
186
+ fixedProjectName.isPreferred = true;
187
+ fixedProjectName.edit = new vscode.WorkspaceEdit();
188
+ fixedProjectName.edit.replace(document.uri, diag.range, calculateProjectName(document.uri));
189
+ result.push(fixedProjectName);
190
+ break;
191
+ case FixKind.REQUIRE_LIBRARIES_TYPO:
192
+ const typo = new vscode.CodeAction("Fix typo", vscode.CodeActionKind.QuickFix);
193
+ typo.diagnostics = [diag];
194
+ typo.isPreferred = true;
195
+ typo.edit = new vscode.WorkspaceEdit();
196
+ typo.edit.replace(document.uri, diag.range, "Require-Libraries");
197
+ result.push(typo);
198
+ break;
199
+ }
200
+ }
201
+ return result;
202
+ }
203
+ }
204
+ function calculateProjectName(uri) {
205
+ const path = path_1.posix.dirname(uri.path);
206
+ if (path_1.posix.basename(uri.path) !== MF_FILE || path_1.posix.basename(path) !== MF_DIR) {
207
+ throw new Error("Cannot calculate project name for <uri.path>");
208
+ }
209
+ return path_1.posix.basename(path_1.posix.dirname(path));
210
+ }
211
+ //# sourceMappingURL=RascalMFValidator.js.map
package/lib/ux/RascalMFValidator.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"RascalMFValidator.js","sourceRoot":"","sources":["../../src/ux/RascalMFValidator.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -9,7 +9,7 @@
9
9
  "parsing",
10
10
  "source code analysis"
11
11
  ],
12
- "version": "0.6.0",
12
+ "version": "0.6.1",
13
13
  "engines": {
14
14
  "vscode": "^1.67.0"
15
15
  },