@usethesource/rascal-vscode-dsl-lsp-server 0.7.0 → 0.8.0

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.
Binary file
Binary file
@@ -1,10 +1,10 @@
1
- declare type ProgressFunc = (percIncrement: number, message: string) => void;
2
- export declare type TemurinArchitectures = "arm" | "aarch64" | "x64";
3
- export declare type TemurinPlatforms = "mac" | "linux" | "windows";
4
- export declare type CorrettoArchitectures = TemurinArchitectures;
5
- export declare type CorrettoPlatforms = "macos" | "linux" | "windows";
6
- export declare type MSArchitectures = "x64" | "aarch64";
7
- export declare type MSPlatforms = "macOS" | "linux" | "windows";
1
+ type ProgressFunc = (percIncrement: number, message: string) => void;
2
+ export type TemurinArchitectures = "arm" | "aarch64" | "x64";
3
+ export type TemurinPlatforms = "mac" | "linux" | "windows";
4
+ export type CorrettoArchitectures = TemurinArchitectures;
5
+ export type CorrettoPlatforms = "macos" | "linux" | "windows";
6
+ export type MSArchitectures = "x64" | "aarch64";
7
+ export type MSPlatforms = "macOS" | "linux" | "windows";
8
8
  export declare function temurinSupported(_jdkVersion: number): boolean;
9
9
  export declare function correttoSupported(jdkVersion: number): boolean;
10
10
  export declare function microsoftSupported(jdkVersion: number): boolean;
@@ -48,6 +48,10 @@ class RascalFileSystemProvider {
48
48
  schemes
49
49
  .filter(s => !this.protectedSchemes.includes(s))
50
50
  .forEach(s => vscode.workspace.registerFileSystemProvider(s, this));
51
+ // we add support for schemes that look inside a jar
52
+ schemes
53
+ .filter(s => s !== "jar" && s !== "zip" && s !== "compressed")
54
+ .forEach(s => vscode.workspace.registerFileSystemProvider("jar+" + s, this));
51
55
  }
52
56
  watch(uri, options) {
53
57
  this.client.sendRequest("rascal/filesystem/watch", {
@@ -65,7 +69,8 @@ class RascalFileSystemProvider {
65
69
  return this.client.sendRequest("rascal/filesystem/stat", { uri: uri.toString() });
66
70
  }
67
71
  readDirectory(uri) {
68
- return this.client.sendRequest("rascal/filesystem/readDirectory", { uri: uri.toString() });
72
+ return this.client.sendRequest("rascal/filesystem/readDirectory", { uri: uri.toString() })
73
+ .then(c => c.map(ft => [ft.name, ft.type]));
69
74
  }
70
75
  createDirectory(uri) {
71
76
  return this.client.sendRequest("rascal/filesystem/createDirectory", { uri: uri.toString() });
@@ -1 +1 @@
1
- {"version":3,"file":"RascalFileSystemProviders.js","sourceRoot":"","sources":["../../src/fs/RascalFileSystemProviders.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RascalFileSystemProviders.js","sourceRoot":"","sources":["../../src/fs/RascalFileSystemProviders.ts"],"names":[],"mappings":"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"}
@@ -29,38 +29,29 @@ exports.run = void 0;
29
29
  */
30
30
  const path = require("path");
31
31
  const Mocha = require("mocha");
32
- const glob = require("glob");
33
- function run() {
32
+ const glob_1 = require("glob");
33
+ async function run() {
34
34
  // Create the mocha test
35
35
  const mocha = new Mocha({
36
36
  ui: 'tdd',
37
37
  color: true
38
38
  });
39
39
  const testsRoot = path.resolve(__dirname, '..');
40
- return new Promise((c, e) => {
41
- glob('vscode-suite/*.test.js', { cwd: testsRoot }, (err, files) => {
42
- if (err) {
43
- return e(err);
44
- }
45
- // Add files to the test suite
46
- files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
47
- try {
48
- // Run the mocha test
49
- mocha.run(failures => {
50
- if (failures > 0) {
51
- e(new Error(`${failures} tests failed.`));
52
- }
53
- else {
54
- c();
55
- }
56
- });
57
- }
58
- catch (err) {
59
- console.error(err);
60
- e(err);
40
+ const files = await (0, glob_1.glob)('vscode-suite/*.test.js', { cwd: testsRoot });
41
+ // Add files to the test suite
42
+ files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
43
+ try {
44
+ // Run the mocha test
45
+ mocha.run(failures => {
46
+ if (failures > 0) {
47
+ throw new Error(`${failures} tests failed.`);
61
48
  }
62
49
  });
63
- });
50
+ }
51
+ catch (err) {
52
+ console.error(err);
53
+ throw err;
54
+ }
64
55
  }
65
56
  exports.run = run;
66
57
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/test/vscode-suite/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,6BAA6B;AAC7B,+BAA+B;AAC/B,6BAA6B;AAE7B,SAAgB,GAAG;IAClB,wBAAwB;IACxB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;QACvB,EAAE,EAAE,KAAK;QACT,KAAK,EAAE,IAAI;KACX,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAEhD,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3B,IAAI,CAAC,wBAAwB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACjE,IAAI,GAAG,EAAE;gBACR,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;aACd;YAED,8BAA8B;YAC9B,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9D,IAAI;gBACH,qBAAqB;gBACrB,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;oBACpB,IAAI,QAAQ,GAAG,CAAC,EAAE;wBACjB,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,QAAQ,gBAAgB,CAAC,CAAC,CAAC;qBAC1C;yBAAM;wBACN,CAAC,EAAE,CAAC;qBACJ;gBACF,CAAC,CAAC,CAAC;aACH;YAAC,OAAO,GAAG,EAAE;gBACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,CAAC,GAAG,CAAC,CAAC;aACP;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AAjCD,kBAiCC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/test/vscode-suite/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,6BAA6B;AAC7B,+BAA+B;AAC/B,+BAA4B;AAErB,KAAK,UAAU,GAAG;IACrB,wBAAwB;IACxB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;QACpB,EAAE,EAAE,KAAK;QACT,KAAK,EAAE,IAAI;KACd,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,MAAM,IAAA,WAAI,EAAC,wBAAwB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IACvE,8BAA8B;IAC9B,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,IAAI;QACA,qBAAqB;QACrB,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACjB,IAAI,QAAQ,GAAG,CAAC,EAAE;gBACd,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,gBAAgB,CAAC,CAAC;aAChD;QACL,CAAC,CAAC,CAAC;KACN;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,MAAM,GAAG,CAAC;KACb;AACL,CAAC;AAvBD,kBAuBC"}
@@ -108,11 +108,12 @@ var FixKind;
108
108
  function checkMissingLastLine(mfBody, diagnostics) {
109
109
  const lastLine = mfBody.lineAt(mfBody.lineCount - 1);
110
110
  if (lastLine.text !== "") {
111
- 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);
111
+ const diag = new vscode.Diagnostic(lastLine.range, `Skipping the last line of ${MF_FILE} completely, unless the file ends with an empty line (no spaces, no comments).`, vscode.DiagnosticSeverity.Error);
112
112
  diag.code = FixKind.addNewLine;
113
113
  diagnostics.push(diag);
114
114
  }
115
115
  }
116
+ const INVALID_PROJECT_NAME = /[^a-z0-9-_]/;
116
117
  function checkIncorrectProjectName(mfBody, diagnostics) {
117
118
  let hasProjectName = false;
118
119
  for (let l = 0; l < mfBody.lineCount; l++) {
@@ -125,19 +126,19 @@ function checkIncorrectProjectName(mfBody, diagnostics) {
125
126
  const targetRange = new vscode.Range(l, offset, l, offset + prName.length);
126
127
  const expectedName = calculateProjectName(mfBody.uri);
127
128
  if (prName !== expectedName) {
128
- const diag = new vscode.Diagnostic(targetRange, `Incorrect project-name, it should equal the directory name (${expectedName})`, vscode.DiagnosticSeverity.Error);
129
+ const diag = new vscode.Diagnostic(targetRange, `Can not handle project names that are not equal to the directory name (${expectedName})`, vscode.DiagnosticSeverity.Error);
129
130
  diag.code = FixKind.fixProjectName;
130
131
  diagnostics.push(diag);
131
132
  }
132
- if (/[^a-z0-9-_]/.test(prName)) {
133
- const diag = new vscode.Diagnostic(targetRange, "Incorrect project-name, it should have only lowercase characters, digits and dashes from [a-z0-9\\-]", vscode.DiagnosticSeverity.Error);
133
+ if (INVALID_PROJECT_NAME.test(prName)) {
134
+ const diag = new vscode.Diagnostic(targetRange, "Can not handle project name (" + prName + ") that is not all lowercase, digits, or dashes, i.e. in " + INVALID_PROJECT_NAME, vscode.DiagnosticSeverity.Error);
134
135
  diag.code = FixKind.removeInvalidCharsProjectName;
135
136
  diagnostics.push(diag);
136
137
  }
137
138
  }
138
139
  }
139
140
  if (!hasProjectName) {
140
- diagnostics.push(new vscode.Diagnostic(new vscode.Range(0, 0, 0, 0), "Missing project name, please add a 'Project-Name' property"));
141
+ diagnostics.push(new vscode.Diagnostic(new vscode.Range(0, 0, 0, 0), "Can not find a project name; please add a 'Project-Name' property"));
141
142
  }
142
143
  }
143
144
  const commonTypos = new Set(['required-libraries', 'require-library', 'required-library']);
@@ -149,7 +150,7 @@ function checkCommonTypo(mfBody, diagnostics) {
149
150
  const key = kvPair[0].trim();
150
151
  if (commonTypos.has(key.toLocaleLowerCase())) {
151
152
  const originalLabel = kvPair[0];
152
- const diag = new vscode.Diagnostic(new vscode.Range(l, 0, l, originalLabel.length), `"${originalLabel} should be Require-Libraries`);
153
+ const diag = new vscode.Diagnostic(new vscode.Range(l, 0, l, originalLabel.length), `"${originalLabel} was not recognized. Did you mean Require-Libraries?`);
153
154
  diag.code = FixKind.requireLibrariesTypo;
154
155
  diagnostics.push(diag);
155
156
  }
@@ -190,7 +191,7 @@ class FixMFErrors {
190
191
  fixedProjectName.diagnostics = [diag];
191
192
  fixedProjectName.isPreferred = true;
192
193
  fixedProjectName.edit = new vscode.WorkspaceEdit();
193
- fixedProjectName.edit.replace(document.uri, diag.range, document.getText(diag.range).replace(/[^a-z0-9-]/g, "-"));
194
+ fixedProjectName.edit.replace(document.uri, diag.range, document.getText(diag.range).replace(new RegExp(INVALID_PROJECT_NAME, "g"), "-"));
194
195
  result.push(fixedProjectName);
195
196
  break;
196
197
  }
@@ -1 +1 @@
1
- {"version":3,"file":"RascalMFValidator.js","sourceRoot":"","sources":["../../src/ux/RascalMFValidator.ts"],"names":[],"mappings":"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"}
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.7.0",
12
+ "version": "0.8.0",
13
13
  "engines": {
14
14
  "vscode": "^1.67.0"
15
15
  },
@@ -30,8 +30,7 @@
30
30
  "prepare": "npm run compile"
31
31
  },
32
32
  "devDependencies": {
33
- "@types/glob": "^7.2.0",
34
- "@types/mocha": "^9.1.1",
33
+ "@types/mocha": "^10.0.1",
35
34
  "@types/node": "^16.x",
36
35
  "@types/node-fetch": "^2.5.12",
37
36
  "@types/tar": "^6.1.1",
@@ -42,15 +41,15 @@
42
41
  "@typescript-eslint/parser": "^5.31.1",
43
42
  "@vscode/test-electron": "^2.1.5",
44
43
  "eslint": "^8.20.0",
45
- "glob": "^8.0.3",
44
+ "glob": "^10.2.6",
46
45
  "license-check-and-add": "^4.0.2",
47
- "mocha": "^10.0.0",
46
+ "mocha": "^10.2.0",
48
47
  "temp": "^0.9.4",
49
48
  "ts-loader": "^9.4.1",
50
- "typescript": "^4.8.4",
49
+ "typescript": "^5.0.4",
51
50
  "vsce": "^2.11.0",
52
51
  "webpack": "^5.76.0",
53
- "webpack-cli": "^4.10.0"
52
+ "webpack-cli": "^5.1.1"
54
53
  },
55
54
  "homepage": "https://github.com/usethesource/rascal-language-servers/",
56
55
  "types": "lib/lsp/library.d.ts",