@usethesource/rascal-vscode-dsl-lsp-server 0.6.2 → 0.7.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.
- package/assets/jars/rascal-lsp.jar +0 -0
- package/assets/jars/rascal.jar +0 -0
- package/lib/RascalTerminalLinkProvider.js +1 -1
- package/lib/RascalTerminalLinkProvider.js.map +1 -1
- package/lib/auto-jvm/JavaLookup.js +7 -5
- package/lib/auto-jvm/JavaLookup.js.map +1 -1
- package/lib/auto-jvm/downloaders.d.ts +2 -2
- package/lib/auto-jvm/downloaders.js +4 -4
- package/lib/auto-jvm/downloaders.js.map +1 -1
- package/lib/extension.js +4 -1
- package/lib/extension.js.map +1 -1
- package/lib/fs/RascalFileSystemProviders.js +26 -1
- package/lib/fs/RascalFileSystemProviders.js.map +1 -1
- package/lib/fs/VSCodeURIResolver.js +4 -2
- package/lib/fs/VSCodeURIResolver.js.map +1 -1
- package/lib/lsp/RascalLSPConnection.js +4 -3
- package/lib/lsp/RascalLSPConnection.js.map +1 -1
- package/lib/test/normal-suite/JavaDownload.test.js +8 -4
- package/lib/test/normal-suite/JavaDownload.test.js.map +1 -1
- package/lib/test/vscode-suite/extension.test.js +6 -1
- package/lib/test/vscode-suite/extension.test.js.map +1 -1
- package/lib/ux/RascalMFValidator.js +40 -35
- package/lib/ux/RascalMFValidator.js.map +1 -1
- package/package.json +2 -2
|
Binary file
|
package/assets/jars/rascal.jar
CHANGED
|
Binary file
|
|
@@ -47,7 +47,7 @@ class RascalTerminalLinkProvider {
|
|
|
47
47
|
}
|
|
48
48
|
const matcher = this.linkDetector();
|
|
49
49
|
let match;
|
|
50
|
-
|
|
50
|
+
const result = [];
|
|
51
51
|
while ((match = matcher.exec(context.line)) !== null && !token.isCancellationRequested) {
|
|
52
52
|
result.push(buildLink(match));
|
|
53
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RascalTerminalLinkProvider.js","sourceRoot":"","sources":["../src/RascalTerminalLinkProvider.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,iCAAiC;AAejC;;GAEG;AACH,MAAa,0BAA0B;IAEnC,YAA8B,MAA+B;QAA/B,WAAM,GAAN,MAAM,CAAyB;IAC7D,CAAC;IAED,YAAY;QACR,gFAAgF;QAChF,OAAO,IAAI,MAAM,CACjB,oDAAoD,CAAC,aAAa;cAChE,kBAAkB,CAAC,oBAAoB;UACzC,GAAG,CAAC,CAAC;IACT,CAAC;IAED,oBAAoB,CAAC,OAA4B,EAAE,KAAwB;QACvE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAC3C,OAAO,IAAI,CAAC;SACf;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACpC,IAAI,KAA6B,CAAC;QAClC,
|
|
1
|
+
{"version":3,"file":"RascalTerminalLinkProvider.js","sourceRoot":"","sources":["../src/RascalTerminalLinkProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ async function getJavaExecutable() {
|
|
|
49
49
|
try {
|
|
50
50
|
// we check the availability of javac, since we need a JDK instead of a JRE
|
|
51
51
|
const versionRun = await pexec(`"${makeJavac(possibleCandidate)}" -version`);
|
|
52
|
-
const versionsFound = /javac (?:1\.)?(
|
|
52
|
+
const versionsFound = /javac (?:1\.)?(\d+)\./.exec(versionRun.stdout);
|
|
53
53
|
if (versionsFound && versionsFound.length > 0) {
|
|
54
54
|
if (Number(versionsFound[1]) >= currentJVMEngineMin && Number(versionsFound[1]) <= currentJVMEngineMax) {
|
|
55
55
|
lookupCompleted = Promise.resolve(possibleCandidate);
|
|
@@ -63,7 +63,9 @@ async function getJavaExecutable() {
|
|
|
63
63
|
}
|
|
64
64
|
// okay, so we don't have a working java interpreter, so we ask the user
|
|
65
65
|
lookupCompleted = askUserForJVM();
|
|
66
|
-
lookupCompleted.then(
|
|
66
|
+
lookupCompleted.then(_good => {
|
|
67
|
+
// ignore success, this callback is only for failures
|
|
68
|
+
}, e => {
|
|
67
69
|
console.log("Automatic download failed: ", e);
|
|
68
70
|
lookupCompleted = undefined;
|
|
69
71
|
});
|
|
@@ -77,7 +79,7 @@ function makeJavac(javaPath) {
|
|
|
77
79
|
return javaPath + "c";
|
|
78
80
|
}
|
|
79
81
|
function getJavaCandidates() {
|
|
80
|
-
|
|
82
|
+
const result = [];
|
|
81
83
|
const { JAVA_HOME } = process.env;
|
|
82
84
|
const name = os.platform() === 'win32' ? 'java.exe' : 'java';
|
|
83
85
|
if (JAVA_HOME) {
|
|
@@ -150,7 +152,7 @@ async function downloadJDK() {
|
|
|
150
152
|
const temurin = "Eclipse Temurin";
|
|
151
153
|
const msJava = "Microsoft Build of OpenJDK";
|
|
152
154
|
const amazon = "Amazon Corretto";
|
|
153
|
-
|
|
155
|
+
const options = [];
|
|
154
156
|
if ((0, downloaders_1.temurinSupported)(currentPreferredJVMEngine)) {
|
|
155
157
|
options.push(temurin);
|
|
156
158
|
}
|
|
@@ -165,7 +167,7 @@ async function downloadJDK() {
|
|
|
165
167
|
location: vscode.ProgressLocation.Notification,
|
|
166
168
|
title: `Downloading ${choice} JDK:`,
|
|
167
169
|
cancellable: false
|
|
168
|
-
}, async (progress,
|
|
170
|
+
}, async (progress, _cancelled) => {
|
|
169
171
|
function actualProgress(percIncrement, message) {
|
|
170
172
|
progress.report({ message: message, increment: percIncrement });
|
|
171
173
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JavaLookup.js","sourceRoot":"","sources":["../../src/auto-jvm/JavaLookup.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,iCAAiC;AACjC,6BAA6B;AAC7B,yBAAyB;AACzB,oCAAoC;AACpC,+CAAiJ;AACjJ,2BAA8C;AAC9C,+BAAiC;AAGjC,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAC/B,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAC/B,MAAM,yBAAyB,GAAG,EAAE,CAAC;AACrC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,yBAAyB,EAAE,CAAC,CAAC;AAEvF,IAAI,eAA6C,CAAC;AAElD,MAAM,KAAK,GAAG,IAAA,gBAAS,EAAC,EAAE,CAAC,IAAI,CAAC,CAAC;AAE1B,KAAK,UAAU,iBAAiB;IACnC,IAAI,eAAe,EAAE;QACjB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,eAAe,CAAC,CAAC;QAC7C,OAAO,eAAe,CAAC;KAC1B;IACD,KAAK,MAAM,iBAAiB,IAAI,iBAAiB,EAAE,EAAE;QACjD,IAAI;YACA,2EAA2E;YAC3E,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;YAC7E,MAAM,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"JavaLookup.js","sourceRoot":"","sources":["../../src/auto-jvm/JavaLookup.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,13 @@ export declare type CorrettoArchitectures = TemurinArchitectures;
|
|
|
5
5
|
export declare type CorrettoPlatforms = "macos" | "linux" | "windows";
|
|
6
6
|
export declare type MSArchitectures = "x64" | "aarch64";
|
|
7
7
|
export declare type MSPlatforms = "macOS" | "linux" | "windows";
|
|
8
|
-
export declare function temurinSupported(
|
|
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;
|
|
11
11
|
export declare function downloadTemurin(mainJVMPath: string, jdkVersion: number, progress: ProgressFunc): Promise<string>;
|
|
12
12
|
export declare function downloadCorretto(mainJVMPath: string, jdkVersion: number, progress: ProgressFunc): Promise<string>;
|
|
13
13
|
export declare function downloadMicrosoftJDK(mainJVMPath: string, jdkVersion: number, progress: ProgressFunc): Promise<string>;
|
|
14
|
-
export declare function identifyLatestTemurinLTSRelease(version: number): Promise<string>;
|
|
14
|
+
export declare function identifyLatestTemurinLTSRelease(version: number, arch: TemurinArchitectures, platform: TemurinPlatforms): Promise<string>;
|
|
15
15
|
export declare function fetchAndUnpackMicrosoftJDK(arch: MSArchitectures, platform: MSPlatforms, jdkVersion: number, mainJVMPath: string, progress: ProgressFunc): Promise<string>;
|
|
16
16
|
export declare function fetchAndUnpackCorretto(arch: CorrettoArchitectures, platform: CorrettoPlatforms, jdkVersion: number, mainJVMPath: string, progress: ProgressFunc): Promise<string>;
|
|
17
17
|
export declare function fetchAndUnpackTemurin(arch: TemurinArchitectures, platform: TemurinPlatforms, jdk11Release: string, mainJVMPath: string, progress: ProgressFunc): Promise<string>;
|
|
@@ -37,7 +37,7 @@ const fs = require("fs");
|
|
|
37
37
|
const promises_1 = require("fs/promises");
|
|
38
38
|
const yauzl = require("yauzl");
|
|
39
39
|
const ppipeline = (0, util_1.promisify)(stream_1.pipeline);
|
|
40
|
-
function temurinSupported(
|
|
40
|
+
function temurinSupported(_jdkVersion) {
|
|
41
41
|
switch (os.arch()) {
|
|
42
42
|
case 'x32': return true;
|
|
43
43
|
case 'x64': return true;
|
|
@@ -86,7 +86,6 @@ function microsoftSupported(jdkVersion) {
|
|
|
86
86
|
}
|
|
87
87
|
exports.microsoftSupported = microsoftSupported;
|
|
88
88
|
async function downloadTemurin(mainJVMPath, jdkVersion, progress) {
|
|
89
|
-
const jdkRelease = await identifyLatestTemurinLTSRelease(jdkVersion);
|
|
90
89
|
const arch = mapTemuringCorrettoArch();
|
|
91
90
|
let platform;
|
|
92
91
|
switch (os.platform()) { // again, it's the compile-time platform, not the runtime one
|
|
@@ -101,6 +100,7 @@ async function downloadTemurin(mainJVMPath, jdkVersion, progress) {
|
|
|
101
100
|
break;
|
|
102
101
|
default: throw new Error("Unsupported platform: " + os.platform());
|
|
103
102
|
}
|
|
103
|
+
const jdkRelease = await identifyLatestTemurinLTSRelease(jdkVersion, arch, platform);
|
|
104
104
|
return fetchAndUnpackTemurin(arch, platform, jdkRelease, mainJVMPath, progress);
|
|
105
105
|
}
|
|
106
106
|
exports.downloadTemurin = downloadTemurin;
|
|
@@ -151,9 +151,9 @@ async function downloadMicrosoftJDK(mainJVMPath, jdkVersion, progress) {
|
|
|
151
151
|
}
|
|
152
152
|
exports.downloadMicrosoftJDK = downloadMicrosoftJDK;
|
|
153
153
|
// locate newest java <version> release
|
|
154
|
-
async function identifyLatestTemurinLTSRelease(version) {
|
|
154
|
+
async function identifyLatestTemurinLTSRelease(version, arch, platform) {
|
|
155
155
|
const releaseRange = encodeURIComponent(`[${version}.0,${version}.999]`);
|
|
156
|
-
const releasesRaw = await (0, node_fetch_1.default)(`https://api.adoptium.net/v3/info/release_versions?heap_size=normal&image_type=jdk&jvm_impl=hotspot<s=true&page=0&page_size=1&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=eclipse&version=${releaseRange}`);
|
|
156
|
+
const releasesRaw = await (0, node_fetch_1.default)(`https://api.adoptium.net/v3/info/release_versions?architecture=${arch}&os=${platform}&heap_size=normal&image_type=jdk&jvm_impl=hotspot<s=true&page=0&page_size=1&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=eclipse&version=${releaseRange}`);
|
|
157
157
|
if (!releasesRaw.ok) {
|
|
158
158
|
throw new Error(`unexpected response ${releasesRaw.statusText}`);
|
|
159
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"downloaders.js","sourceRoot":"","sources":["../../src/auto-jvm/downloaders.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"downloaders.js","sourceRoot":"","sources":["../../src/auto-jvm/downloaders.ts"],"names":[],"mappings":"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"}
|
package/lib/extension.js
CHANGED
|
@@ -40,6 +40,9 @@ function activate(context) {
|
|
|
40
40
|
return extension.externalLanguageRegistry();
|
|
41
41
|
}
|
|
42
42
|
exports.activate = activate;
|
|
43
|
-
function deactivate() {
|
|
43
|
+
function deactivate() {
|
|
44
|
+
// no deactivation logic yet, since we push everything as a disposable
|
|
45
|
+
// although maybe we should do something here with the closing of connections to the REPLs that are still running
|
|
46
|
+
}
|
|
44
47
|
exports.deactivate = deactivate;
|
|
45
48
|
//# sourceMappingURL=extension.js.map
|
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;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,
|
|
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;IACtB,sEAAsE;IACtE,iHAAiH;AACrH,CAAC;AAHD,gCAGC"}
|
|
@@ -1,6 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RascalFileSystemProvider = 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
|
+
*/
|
|
4
30
|
const vscode = require("vscode");
|
|
5
31
|
class RascalFileSystemProvider {
|
|
6
32
|
/**
|
|
@@ -24,7 +50,6 @@ class RascalFileSystemProvider {
|
|
|
24
50
|
.forEach(s => vscode.workspace.registerFileSystemProvider(s, this));
|
|
25
51
|
}
|
|
26
52
|
watch(uri, options) {
|
|
27
|
-
// TODO: fix this
|
|
28
53
|
this.client.sendRequest("rascal/filesystem/watch", {
|
|
29
54
|
uri: uri.toString(),
|
|
30
55
|
recursive: options.recursive,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RascalFileSystemProviders.js","sourceRoot":"","sources":["../../src/fs/RascalFileSystemProviders.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"RascalFileSystemProviders.js","sourceRoot":"","sources":["../../src/fs/RascalFileSystemProviders.ts"],"names":[],"mappings":"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"}
|
|
@@ -311,7 +311,7 @@ class ResolverClient {
|
|
|
311
311
|
if (this.isRascalNative(removeWatch)) {
|
|
312
312
|
return buildIOError("Cannot watch on a rascal uri: " + removeWatch.uri);
|
|
313
313
|
}
|
|
314
|
-
|
|
314
|
+
const watcher = this.activeWatches.get(removeWatch.uri);
|
|
315
315
|
if (watcher) {
|
|
316
316
|
this.activeWatches.delete(removeWatch.uri);
|
|
317
317
|
watcher.dispose();
|
|
@@ -333,6 +333,7 @@ class ResolverClient {
|
|
|
333
333
|
this.connection.end();
|
|
334
334
|
}
|
|
335
335
|
catch (_e) {
|
|
336
|
+
// ignore errors here, ase we are disposing anyway
|
|
336
337
|
}
|
|
337
338
|
}
|
|
338
339
|
}
|
|
@@ -374,10 +375,11 @@ async function determineType(uri, changeType) {
|
|
|
374
375
|
case ISourceLocationChangeType.modified:
|
|
375
376
|
// no modified events for directories according to documentation
|
|
376
377
|
return ISourceLocationType.file;
|
|
377
|
-
case ISourceLocationChangeType.deleted:
|
|
378
|
+
case ISourceLocationChangeType.deleted: {
|
|
378
379
|
// we have to guess, since we cannot ask anymore.
|
|
379
380
|
const filePart = uri.path.substring(uri.path.lastIndexOf('/'));
|
|
380
381
|
return filePart.lastIndexOf('.') > 0 ? ISourceLocationType.file : ISourceLocationType.directory;
|
|
382
|
+
}
|
|
381
383
|
}
|
|
382
384
|
}
|
|
383
385
|
//# sourceMappingURL=VSCodeURIResolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VSCodeURIResolver.js","sourceRoot":"","sources":["../../src/fs/VSCodeURIResolver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"VSCodeURIResolver.js","sourceRoot":"","sources":["../../src/fs/VSCodeURIResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,13 +60,14 @@ async function activateLanguageClient({ language, title, jarPath, vfsServer, isP
|
|
|
60
60
|
exports.activateLanguageClient = activateLanguageClient;
|
|
61
61
|
async function showContentPanel(url) {
|
|
62
62
|
// dispose of old panel in case it existed
|
|
63
|
+
const externalURL = (await vscode.env.asExternalUri(vscode.Uri.parse(url))).toString();
|
|
63
64
|
const allOpenTabs = vscode.window.tabGroups.all.flatMap(tg => tg.tabs);
|
|
64
|
-
const tabsForThisPanel = allOpenTabs.filter(t => t.input instanceof vscode.TabInputWebview && t.label ===
|
|
65
|
+
const tabsForThisPanel = allOpenTabs.filter(t => t.input instanceof vscode.TabInputWebview && t.label === externalURL);
|
|
65
66
|
await vscode.window.tabGroups.close(tabsForThisPanel);
|
|
66
|
-
const panel = vscode.window.createWebviewPanel("text/html",
|
|
67
|
+
const panel = vscode.window.createWebviewPanel("text/html", externalURL, vscode.ViewColumn.One, {
|
|
67
68
|
enableScripts: true,
|
|
68
69
|
});
|
|
69
|
-
loadURLintoPanel(panel,
|
|
70
|
+
loadURLintoPanel(panel, externalURL);
|
|
70
71
|
}
|
|
71
72
|
function loadURLintoPanel(panel, url) {
|
|
72
73
|
panel.webview.html = `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RascalLSPConnection.js","sourceRoot":"","sources":["../../src/lsp/RascalLSPConnection.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,iCAAiC;AACjC,2BAA2B;AAC3B,yBAAyB;AACzB,6BAA6B;AAE7B,qDAAuH;AACvH,uDAA2D;AAC3D,+EAA2E;AAKpE,KAAK,UAAU,sBAAsB,CACxC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,GAAG,KAAK,EAAE,UAAU,GAAG,IAAI,EAAE,OAAO,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,KAAK,EAAE,MAAM,GAAG,EAAE,EAC4E;IAE9M,MAAM,aAAa,GAAkB,UAAU;QAC3C,CAAC,CAAC,MAAM,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,CAAC;QAChF,CAAC,CAAC,GAAG,EAAE,CAAC,mCAAmC,CAAC,OAAO,CAAC,CAAC,8CAA8C;aAC9F,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAC,CAAA,CAAC,CAAC;IAE1E,MAAM,aAAa,GAA0B;QACzC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;KAC1D,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,qBAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC,UAAU,CAAC,CAAC;IAE9F,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACrB,MAAM,CAAC,gBAAgB,CAAC,qBAAqB,EAAE;QAC3C,IAAI,EAAE,SAAS,CAAC,IAAI;KACvB,CAAC,CAAC;IACH,MAAM,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,EAAkB,EAAE,EAAE;QAC/D,gBAAgB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CAAW,2BAA2B,CAAC,CAAC;IAE/E,YAAY,CAAC,IAAI,CAAE,OAAO,CAAC,EAAE;QACzB,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,oDAAwB,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAGH,OAAO,MAAM,CAAC;AAClB,CAAC;AAhCD,wDAgCC;AAED,KAAK,UAAU,gBAAgB,CAAC,GAAW;IACvC,0CAA0C;IAC1C,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IACvE,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,YAAY,MAAM,CAAC,eAAe,IAAI,CAAC,CAAC,KAAK,KAAK,
|
|
1
|
+
{"version":3,"file":"RascalLSPConnection.js","sourceRoot":"","sources":["../../src/lsp/RascalLSPConnection.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,iCAAiC;AACjC,2BAA2B;AAC3B,yBAAyB;AACzB,6BAA6B;AAE7B,qDAAuH;AACvH,uDAA2D;AAC3D,+EAA2E;AAKpE,KAAK,UAAU,sBAAsB,CACxC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,GAAG,KAAK,EAAE,UAAU,GAAG,IAAI,EAAE,OAAO,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,KAAK,EAAE,MAAM,GAAG,EAAE,EAC4E;IAE9M,MAAM,aAAa,GAAkB,UAAU;QAC3C,CAAC,CAAC,MAAM,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,CAAC;QAChF,CAAC,CAAC,GAAG,EAAE,CAAC,mCAAmC,CAAC,OAAO,CAAC,CAAC,8CAA8C;aAC9F,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAC,CAAA,CAAC,CAAC;IAE1E,MAAM,aAAa,GAA0B;QACzC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;KAC1D,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,qBAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC,UAAU,CAAC,CAAC;IAE9F,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACrB,MAAM,CAAC,gBAAgB,CAAC,qBAAqB,EAAE;QAC3C,IAAI,EAAE,SAAS,CAAC,IAAI;KACvB,CAAC,CAAC;IACH,MAAM,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,EAAkB,EAAE,EAAE;QAC/D,gBAAgB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CAAW,2BAA2B,CAAC,CAAC;IAE/E,YAAY,CAAC,IAAI,CAAE,OAAO,CAAC,EAAE;QACzB,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,oDAAwB,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAGH,OAAO,MAAM,CAAC;AAClB,CAAC;AAhCD,wDAgCC;AAED,KAAK,UAAU,gBAAgB,CAAC,GAAW;IACvC,0CAA0C;IAC1C,MAAM,WAAW,GAAG,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACvF,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IACvE,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,YAAY,MAAM,CAAC,eAAe,IAAI,CAAC,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC;IAEvH,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEtD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAC1C,WAAW,EACX,WAAW,EACX,MAAM,CAAC,UAAU,CAAC,GAAG,EACrB;QACI,aAAa,EAAE,IAAI;KACtB,CACJ,CAAC;IAEF,gBAAgB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AACzC,CAAC;AAGD,SAAS,gBAAgB,CAAC,KAAyB,EAAE,GAAU;IAC3D,KAAK,CAAC,OAAO,CAAC,IAAI,GAAG;;;;;;;;;;uBAUF,GAAG;;;;;sBAKJ,GAAG;;;oBAGL,CAAC;AACrB,CAAC;AAQD,KAAK,UAAU,wBAAwB,CAAC,OAAe,EAAE,kBAA2B,EAAE,SAAkB,EAAE,MAA2B;IACjI,MAAM,SAAS,GAAG,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG;QAChB,iFAAiF;QAC/E,sBAAsB;QACtB,yEAAyE;QACzE,0BAA0B;QAC1B,6BAA6B,GAAG,SAAS;KAC9C,CAAC;IACF,IAAI,SAAiB,CAAC;IACtB,IAAI,kBAAkB,EAAE;QACpB,SAAS,GAAG,8DAA8D,CAAC;QAC3E,WAAW,CAAC,IAAI,CAAC,6BAA6B,CAAC,SAAS,CAAC,CAAC,CAAC;KAC9D;SACI;QACD,SAAS,GAAG,sDAAsD,CAAC;QACnE,WAAW,CAAC,IAAI,CAAC,gCAAgC,EAAE,CAAC,CAAC;KACxD;IACD,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,kBAAkB,IAAI,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE;QACzD,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAC5B;IACD,OAAO;QACH,OAAO,EAAE,MAAM,IAAA,8BAAiB,GAAE;QAClC,IAAI,EAAE,WAAW;KACpB,CAAC;AACN,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAc,EAAE,kBAA2B;IACrE,MAAM,IAAI,GAAG,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAC9C,IAAI,CAAC,kBAAkB,EAAE;QACrB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;KAC/C;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,EAAE,CAAC,MAAe;IACvB,OAAO,MAAM,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,gCAAgC;IACrC,oGAAoG;IACpG,IAAI,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE;QACzB,OAAO,WAAW,CAAC;KACtB;IACD,IAAI,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE;QACzB,OAAO,WAAW,CAAC;KAEtB;IACD,IAAI,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;QACxB,OAAO,WAAW,CAAC;KACtB;IACD,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,6BAA6B,CAAC,UAAmB;IACtD,yEAAyE;IACzE,4EAA4E;IAC5E,IAAI,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE;QACzB,OAAO,WAAW,CAAC;KACtB;IACD,IAAI,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE;QACzB,OAAO,WAAW,CAAC;KACtB;IACD,IAAI,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;QACxB,OAAO,WAAW,CAAC;KACtB;IACD,OAAO,UAAU,CAAC;AAEtB,CAAC;AAED,SAAS,mCAAmC,CAAC,IAAY;IACrD,OAAO,IAAI,OAAO,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,MAAM,IAAI,GAAG,WAAW,CAAC;QACzB,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QAChC,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,SAAS,KAAK,CAAC,GAAW;YACtB,IAAI,KAAK,IAAI,QAAQ,EAAE;gBACnB,UAAU,CAAE,GAAG,EAAE;oBACb,KAAK,EAAE,CAAC;oBACR,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,GAAG,GAAG,CAAC,CAAC;oBAC9C,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC/B,CAAC,EAAE,UAAU,CAAC,CAAC;aAClB;iBACI;gBACD,OAAO,MAAM,CAAC,6BAA6B,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACpF;QACL,CAAC;QAED,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE;YACxB,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACrB,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAC5B,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -32,23 +32,26 @@ const temp = require("temp");
|
|
|
32
32
|
const jd = require("../../auto-jvm/downloaders");
|
|
33
33
|
const mocha_1 = require("mocha");
|
|
34
34
|
const path_1 = require("path");
|
|
35
|
+
function emptyProgress() {
|
|
36
|
+
// no progress report for tests
|
|
37
|
+
}
|
|
35
38
|
(0, mocha_1.describe)('JVM Download', function () {
|
|
36
39
|
const tempDir = temp.mkdirSync();
|
|
37
40
|
function testTemurin(version, arch, platform) {
|
|
38
41
|
return async function () {
|
|
39
|
-
const newPath = await jd.fetchAndUnpackTemurin(arch, platform, await jd.identifyLatestTemurinLTSRelease(version), (0, path_1.join)(tempDir, "temurin", arch, platform),
|
|
42
|
+
const newPath = await jd.fetchAndUnpackTemurin(arch, platform, await jd.identifyLatestTemurinLTSRelease(version, arch, platform), (0, path_1.join)(tempDir, "temurin", arch, platform), emptyProgress);
|
|
40
43
|
assert.ok((0, fs_1.statSync)(newPath).isFile());
|
|
41
44
|
};
|
|
42
45
|
}
|
|
43
46
|
function testCorretto(version, arch, platform) {
|
|
44
47
|
return async function () {
|
|
45
|
-
const newPath = await jd.fetchAndUnpackCorretto(arch, platform, version, (0, path_1.join)(tempDir, "corretto", arch, platform),
|
|
48
|
+
const newPath = await jd.fetchAndUnpackCorretto(arch, platform, version, (0, path_1.join)(tempDir, "corretto", arch, platform), emptyProgress);
|
|
46
49
|
assert.ok((0, fs_1.statSync)(newPath).isFile());
|
|
47
50
|
};
|
|
48
51
|
}
|
|
49
52
|
function testMSOpenJDK(version, arch, platform) {
|
|
50
53
|
return async function () {
|
|
51
|
-
const newPath = await jd.fetchAndUnpackMicrosoftJDK(arch, platform, version, (0, path_1.join)(tempDir, "msjdk", arch, platform),
|
|
54
|
+
const newPath = await jd.fetchAndUnpackMicrosoftJDK(arch, platform, version, (0, path_1.join)(tempDir, "msjdk", arch, platform), emptyProgress);
|
|
52
55
|
assert.ok((0, fs_1.statSync)(newPath).isFile());
|
|
53
56
|
};
|
|
54
57
|
}
|
|
@@ -59,6 +62,7 @@ const path_1 = require("path");
|
|
|
59
62
|
it(`Mac x64`, testTemurin(11, "x64", "mac")).timeout(downloadTimeout);
|
|
60
63
|
it(`Linux arm`, testTemurin(11, "arm", "linux")).timeout(downloadTimeout);
|
|
61
64
|
}
|
|
65
|
+
it(`Mac aarch64`, testTemurin(11, "aarch64", "mac")).timeout(downloadTimeout);
|
|
62
66
|
it(`Windows x64`, testTemurin(11, "x64", "windows")).timeout(downloadTimeout);
|
|
63
67
|
});
|
|
64
68
|
(0, mocha_1.describe)(`Eclipse Temurin jdk17`, function () {
|
|
@@ -99,7 +103,7 @@ const path_1 = require("path");
|
|
|
99
103
|
(0, mocha_1.after)(() => {
|
|
100
104
|
console.log(tempDir);
|
|
101
105
|
// do the rm in the background, since it might take a while
|
|
102
|
-
(0, fs_1.rm)(tempDir, { recursive: true, force: true },
|
|
106
|
+
(0, fs_1.rm)(tempDir, { recursive: true, force: true }, emptyProgress);
|
|
103
107
|
});
|
|
104
108
|
});
|
|
105
109
|
//# sourceMappingURL=JavaDownload.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JavaDownload.test.js","sourceRoot":"","sources":["../../../src/test/normal-suite/JavaDownload.test.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,iCAAiC;AACjC,2BAAkC;AAClC,6BAA8B;AAC9B,iDAAiD;AACjD,iCAAwC;AACxC,+BAA4B;AAG5B,IAAA,gBAAQ,EAAC,cAAc,EAAE;IACrB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IACjC,SAAS,WAAW,CAAC,OAAe,EAAE,IAA6B,EAAE,QAA6B;QAC9F,OAAO,KAAK;YACR,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAC/C,QAAQ,EAAE,MAAM,EAAE,CAAC,+BAA+B,CAAC,OAAO,CAAC,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"JavaDownload.test.js","sourceRoot":"","sources":["../../../src/test/normal-suite/JavaDownload.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,8 +31,13 @@ const vscode = require("vscode");
|
|
|
31
31
|
suite('Extension Test Suite', () => {
|
|
32
32
|
vscode.window.showInformationMessage('Start all tests.');
|
|
33
33
|
suiteSetup(async function () {
|
|
34
|
-
await vscode.extensions.getExtension('usethesource.rascalmpl')
|
|
34
|
+
const extension = await vscode.extensions.getExtension('usethesource.rascalmpl');
|
|
35
|
+
if (!extension) {
|
|
36
|
+
throw new Error("Could not initialize extension");
|
|
37
|
+
}
|
|
38
|
+
extension.activate();
|
|
35
39
|
});
|
|
40
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion
|
|
36
41
|
const rascalExtension = vscode.extensions.getExtension('usethesource.rascalmpl');
|
|
37
42
|
test("Rascal extension is started", () => {
|
|
38
43
|
assert.strictEqual(rascalExtension.isActive, true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension.test.js","sourceRoot":"","sources":["../../../src/test/vscode-suite/extension.test.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,iCAAiC;AACjC,iCAAiC;AAEjC,KAAK,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAC/B,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;IAEzD,UAAU,CAAC,KAAK;
|
|
1
|
+
{"version":3,"file":"extension.test.js","sourceRoot":"","sources":["../../../src/test/vscode-suite/extension.test.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,iCAAiC;AACjC,iCAAiC;AAEjC,KAAK,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAC/B,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;IAEzD,UAAU,CAAC,KAAK;QACZ,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,wBAAwB,CAAC,CAAC;QACjF,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;SACrD;QACP,SAAS,CAAC,QAAQ,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEA,wGAAwG;IACxG,MAAM,eAAe,GAAyB,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,wBAAwB,CAAE,CAAC;IAExG,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,4BAA4B,EAAE,EAAE,IAAI,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}
|
|
@@ -73,12 +73,12 @@ class RascalMFValidator {
|
|
|
73
73
|
try {
|
|
74
74
|
this.diagnostics.dispose();
|
|
75
75
|
}
|
|
76
|
-
catch (_e) { }
|
|
76
|
+
catch (_e) { /* ignoring errors */ }
|
|
77
77
|
for (const d of this.toDispose) {
|
|
78
78
|
try {
|
|
79
79
|
d.dispose();
|
|
80
80
|
}
|
|
81
|
-
catch (_e) { }
|
|
81
|
+
catch (_e) { /* ignoring errors */ }
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
async verifyRascalMF(file) {
|
|
@@ -92,22 +92,24 @@ class RascalMFValidator {
|
|
|
92
92
|
this.diagnostics.set(file, diagnostics);
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
|
-
catch (
|
|
95
|
+
catch (_error) {
|
|
96
|
+
// ignoring errors
|
|
96
97
|
}
|
|
97
98
|
}
|
|
98
99
|
}
|
|
99
100
|
exports.RascalMFValidator = RascalMFValidator;
|
|
100
101
|
var FixKind;
|
|
101
102
|
(function (FixKind) {
|
|
102
|
-
FixKind[FixKind["
|
|
103
|
-
FixKind[FixKind["
|
|
104
|
-
FixKind[FixKind["
|
|
103
|
+
FixKind[FixKind["addNewLine"] = 1] = "addNewLine";
|
|
104
|
+
FixKind[FixKind["fixProjectName"] = 2] = "fixProjectName";
|
|
105
|
+
FixKind[FixKind["requireLibrariesTypo"] = 3] = "requireLibrariesTypo";
|
|
106
|
+
FixKind[FixKind["removeInvalidCharsProjectName"] = 4] = "removeInvalidCharsProjectName";
|
|
105
107
|
})(FixKind || (FixKind = {}));
|
|
106
108
|
function checkMissingLastLine(mfBody, diagnostics) {
|
|
107
109
|
const lastLine = mfBody.lineAt(mfBody.lineCount - 1);
|
|
108
110
|
if (lastLine.text !== "") {
|
|
109
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);
|
|
110
|
-
diag.code = FixKind.
|
|
112
|
+
diag.code = FixKind.addNewLine;
|
|
111
113
|
diagnostics.push(diag);
|
|
112
114
|
}
|
|
113
115
|
}
|
|
@@ -119,12 +121,17 @@ function checkIncorrectProjectName(mfBody, diagnostics) {
|
|
|
119
121
|
if (kvPair.length === 2 && kvPair[0].trim() === "Project-Name") {
|
|
120
122
|
hasProjectName = true;
|
|
121
123
|
const prName = kvPair[1].split("#")[0].trim();
|
|
124
|
+
const offset = line.text.indexOf(prName);
|
|
125
|
+
const targetRange = new vscode.Range(l, offset, l, offset + prName.length);
|
|
122
126
|
const expectedName = calculateProjectName(mfBody.uri);
|
|
123
127
|
if (prName !== expectedName) {
|
|
124
|
-
const offset = line.text.indexOf(prName);
|
|
125
|
-
const targetRange = new vscode.Range(l, offset, l, offset + prName.length);
|
|
126
128
|
const diag = new vscode.Diagnostic(targetRange, `Incorrect project-name, it should equal the directory name (${expectedName})`, vscode.DiagnosticSeverity.Error);
|
|
127
|
-
diag.code = FixKind.
|
|
129
|
+
diag.code = FixKind.fixProjectName;
|
|
130
|
+
diagnostics.push(diag);
|
|
131
|
+
}
|
|
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);
|
|
134
|
+
diag.code = FixKind.removeInvalidCharsProjectName;
|
|
128
135
|
diagnostics.push(diag);
|
|
129
136
|
}
|
|
130
137
|
}
|
|
@@ -133,47 +140,33 @@ function checkIncorrectProjectName(mfBody, diagnostics) {
|
|
|
133
140
|
diagnostics.push(new vscode.Diagnostic(new vscode.Range(0, 0, 0, 0), "Missing project name, please add a 'Project-Name' property"));
|
|
134
141
|
}
|
|
135
142
|
}
|
|
143
|
+
const commonTypos = new Set(['required-libraries', 'require-library', 'required-library']);
|
|
136
144
|
function checkCommonTypo(mfBody, diagnostics) {
|
|
137
145
|
for (let l = 0; l < mfBody.lineCount; l++) {
|
|
138
146
|
const line = mfBody.lineAt(l);
|
|
139
147
|
const kvPair = line.text.split(":");
|
|
140
148
|
if (kvPair.length >= 2) {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
fixType = FixKind.REQUIRE_LIBRARIES_TYPO;
|
|
148
|
-
break;
|
|
149
|
-
case "Required-Library":
|
|
150
|
-
fixType = FixKind.REQUIRE_LIBRARIES_TYPO;
|
|
151
|
-
break;
|
|
152
|
-
}
|
|
153
|
-
switch (fixType) {
|
|
154
|
-
case FixKind.REQUIRE_LIBRARIES_TYPO:
|
|
155
|
-
const originalLabel = kvPair[0];
|
|
156
|
-
const diag = new vscode.Diagnostic(new vscode.Range(l, 0, l, originalLabel.length), `"${originalLabel} should be Require-Libraries`);
|
|
157
|
-
diag.code = FixKind.REQUIRE_LIBRARIES_TYPO;
|
|
158
|
-
diagnostics.push(diag);
|
|
149
|
+
const key = kvPair[0].trim();
|
|
150
|
+
if (commonTypos.has(key.toLocaleLowerCase())) {
|
|
151
|
+
const originalLabel = kvPair[0];
|
|
152
|
+
const diag = new vscode.Diagnostic(new vscode.Range(l, 0, l, originalLabel.length), `"${originalLabel} should be Require-Libraries`);
|
|
153
|
+
diag.code = FixKind.requireLibrariesTypo;
|
|
154
|
+
diagnostics.push(diag);
|
|
159
155
|
}
|
|
160
156
|
}
|
|
161
157
|
}
|
|
162
158
|
}
|
|
163
|
-
function hasNewline(tl) {
|
|
164
|
-
return tl.range.end.character !== tl.rangeIncludingLineBreak.end.character;
|
|
165
|
-
}
|
|
166
159
|
function buildMFChildPath(uri) {
|
|
167
160
|
return uri.with({
|
|
168
161
|
path: path_1.posix.join(uri.path, MF_DIR, MF_FILE)
|
|
169
162
|
});
|
|
170
163
|
}
|
|
171
164
|
class FixMFErrors {
|
|
172
|
-
provideCodeActions(document, range, context,
|
|
165
|
+
provideCodeActions(document, range, context, _token) {
|
|
173
166
|
const result = [];
|
|
174
167
|
for (const diag of context.diagnostics) {
|
|
175
168
|
switch (diag.code) {
|
|
176
|
-
case FixKind.
|
|
169
|
+
case FixKind.addNewLine: {
|
|
177
170
|
const addNewline = new vscode.CodeAction("Add newline", vscode.CodeActionKind.QuickFix);
|
|
178
171
|
addNewline.diagnostics = [diag];
|
|
179
172
|
addNewline.isPreferred = true;
|
|
@@ -182,7 +175,8 @@ class FixMFErrors {
|
|
|
182
175
|
addNewline.edit.insert(document.uri, lastLine.rangeIncludingLineBreak.end, (document.eol === vscode.EndOfLine.CRLF ? "\r\n" : "\n"));
|
|
183
176
|
result.push(addNewline);
|
|
184
177
|
break;
|
|
185
|
-
|
|
178
|
+
}
|
|
179
|
+
case FixKind.fixProjectName: {
|
|
186
180
|
const fixedProjectName = new vscode.CodeAction("Fix project-name", vscode.CodeActionKind.QuickFix);
|
|
187
181
|
fixedProjectName.diagnostics = [diag];
|
|
188
182
|
fixedProjectName.isPreferred = true;
|
|
@@ -190,7 +184,17 @@ class FixMFErrors {
|
|
|
190
184
|
fixedProjectName.edit.replace(document.uri, diag.range, calculateProjectName(document.uri));
|
|
191
185
|
result.push(fixedProjectName);
|
|
192
186
|
break;
|
|
193
|
-
|
|
187
|
+
}
|
|
188
|
+
case FixKind.removeInvalidCharsProjectName: {
|
|
189
|
+
const fixedProjectName = new vscode.CodeAction("Remove invalid chars in project-name", vscode.CodeActionKind.QuickFix);
|
|
190
|
+
fixedProjectName.diagnostics = [diag];
|
|
191
|
+
fixedProjectName.isPreferred = true;
|
|
192
|
+
fixedProjectName.edit = new vscode.WorkspaceEdit();
|
|
193
|
+
fixedProjectName.edit.replace(document.uri, diag.range, document.getText(diag.range).replace(/[^a-z0-9-]/g, "-"));
|
|
194
|
+
result.push(fixedProjectName);
|
|
195
|
+
break;
|
|
196
|
+
}
|
|
197
|
+
case FixKind.requireLibrariesTypo: {
|
|
194
198
|
const typo = new vscode.CodeAction("Fix typo", vscode.CodeActionKind.QuickFix);
|
|
195
199
|
typo.diagnostics = [diag];
|
|
196
200
|
typo.isPreferred = true;
|
|
@@ -198,6 +202,7 @@ class FixMFErrors {
|
|
|
198
202
|
typo.edit.replace(document.uri, diag.range, "Require-Libraries");
|
|
199
203
|
result.push(typo);
|
|
200
204
|
break;
|
|
205
|
+
}
|
|
201
206
|
}
|
|
202
207
|
}
|
|
203
208
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RascalMFValidator.js","sourceRoot":"","sources":["../../src/ux/RascalMFValidator.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,iCAAiC;AACjC,+BAA2B,CAAC,qDAAqD;AAGjF,MAAM,OAAO,GAAG,WAAW,CAAC;AAC5B,MAAM,MAAM,GAAG,UAAU,CAAC;AAE1B;;GAEG;AACH,MAAa,iBAAiB;IAI1B;QAFiB,cAAS,GAAwB,EAAE,CAAC;QAGjD,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,0BAA0B,CAAC,uBAAuB,CAAC,CAAC;QAExF,oCAAoC;QACpC,MAAM,CAAC,SAAS,CAAC,2BAA2B,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YACpD,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,KAAK,EAAE;gBAC1B,IAAI;oBACA,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAC1C,MAAM,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACtC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;iBAC9B;gBACD,OAAO,YAAY,EAAE;oBACjB,mCAAmC;iBACtC;aACJ;YACD,KAAK,MAAM,GAAG,IAAI,EAAE,CAAC,OAAO,EAAE;gBAC1B,sDAAsD;gBACtD,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;aACtD;QACL,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAEzB,sDAAsD;QACtD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,SAAS,CAAC,gBAAgB,IAAI,EAAE,EAAE;YAC/D,MAAM,KAAK,GAAG,gBAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAChD,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;SAC1E;QAED,uEAAuE;QACvE,+GAA+G;QAC/G,uDAAuD;QACvD,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,KAAK,GAAG,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9F,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/D,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,0BAA0B;QACtG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE7B,IAAI,CAAC,SAAS,CAAC,IAAI,CACf,MAAM,CAAC,SAAS,CAAC,2BAA2B,CACxC,EAAC,OAAO,EAAE,KAAK,GAAG,OAAO,EAAC,EAC1B,IAAI,WAAW,EAAE,CACpB,CACJ,CAAC;IACN,CAAC;IAED,OAAO;QACH,IAAI;YACA,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;SAC9B;QAAC,OAAO,EAAE,EAAE,
|
|
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.
|
|
12
|
+
"version": "0.7.0",
|
|
13
13
|
"engines": {
|
|
14
14
|
"vscode": "^1.67.0"
|
|
15
15
|
},
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"ts-loader": "^9.4.1",
|
|
50
50
|
"typescript": "^4.8.4",
|
|
51
51
|
"vsce": "^2.11.0",
|
|
52
|
-
"webpack": "^5.
|
|
52
|
+
"webpack": "^5.76.0",
|
|
53
53
|
"webpack-cli": "^4.10.0"
|
|
54
54
|
},
|
|
55
55
|
"homepage": "https://github.com/usethesource/rascal-language-servers/",
|