Fix file extension for Windows platform.

JetBrains · Nov 14, 2023 · 7440472 · 7440472
1 parent 7bbe9bf
commit 7440472
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/vscode/qodana/src/core/jdk/jbrDownloader.ts b/vscode/qodana/src/core/jdk/jbrDownloader.ts
@@ -56,10 +56,11 @@ export async function extractJbr(filePath: string, releaseName: string, extractP
             cwd: extractPath
         });
         let dirName = releaseName.replace('.tar.gz', '');
-        if (getOsAndArch().osType === 'osx') {
+        let osType = getOsAndArch().osType;
+        if (osType === 'osx') {
             return path.join(extractPath, dirName, 'Contents', 'Home', 'bin', 'java');
         }
-        return path.join(extractPath, dirName, 'bin', 'java');
+        return path.join(extractPath, dirName, 'bin', 'java'  + (osType === 'windows' ? '.exe' : ''));
     } catch (e) {
         vscode.window.showErrorMessage(failedToDownloadJbr(filePath) + `: ${e}`);
         telemetry.errorReceived('#extractJbr exception');
@@ -180,11 +181,11 @@ export async function getJavaForExecution(context: vscode.ExtensionContext): Pro
                 await context.globalState.update('javaExecutablePath', undefined);
             }
         }
-        let localJava = getJavaExecutablePath();
-        if (localJava) {
-            await context.globalState.update('javaExecutablePath', localJava);
-            return localJava;
-        }
+        //let localJava = getJavaExecutablePath();
+        //if (localJava) {
+        //    await context.globalState.update('javaExecutablePath', localJava);
+        //    return localJava;
+        //}
         let decision = await vscode.window.showErrorMessage(DOWNLOAD_CONFIRMATION, YES, NO);
         if (decision === YES) {
             let downloadedJbrDir = path.join(context.globalStorageUri.fsPath, Math.random().toString(36).substring(7));

diff --git a/vscode/qodana/src/test/suite/jdk.test.ts b/vscode/qodana/src/test/suite/jdk.test.ts
@@ -31,6 +31,8 @@ describe('JBR Downloader', () => {
             await fs.promises.access(javaPath!);
             assert.strictEqual(javaPath!.endsWith('java') || javaPath!.endsWith('java.exe'), true);
         } catch (e) {
+            assert.fail('Failed to download and unpack the JBR');
+        } finally {
             await fs.promises.rm(tempDirName, { recursive: true });
         }
     });