Skip to content

Commit d24fb2c

Browse files
committed
Revert "Ignore the unsupported java versions when auto detecting the installed jdks (#3258)"
This reverts commit 133f9f3.
1 parent 42cd9ec commit d24fb2c

3 files changed

Lines changed: 3 additions & 18 deletions

File tree

src/extension.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import { Telemetry } from './telemetry';
3535
import { getMessage } from './errorUtils';
3636
import { TelemetryService } from '@redhat-developer/vscode-redhat-telemetry/lib';
3737
import { activationProgressNotification } from "./serverTaskPresenter";
38-
import { loadSupportedJreNames } from './jdkUtils';
3938

4039
const syntaxClient: SyntaxLanguageClient = new SyntaxLanguageClient();
4140
const standardClient: StandardLanguageClient = new StandardLanguageClient();
@@ -90,8 +89,7 @@ function getHeapDumpFolderFromSettings(): string {
9089
}
9190

9291

93-
export async function activate(context: ExtensionContext): Promise<ExtensionAPI> {
94-
await loadSupportedJreNames(context);
92+
export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
9593
context.subscriptions.push(markdownPreviewProvider);
9694
context.subscriptions.push(commands.registerCommand(Commands.TEMPLATE_VARIABLES, async () => {
9795
markdownPreviewProvider.show(context.asAbsolutePath(path.join('document', `${Commands.TEMPLATE_VARIABLES}.md`)), 'Predefined Variables', "", context);

src/jdkUtils.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
11
'use strict';
22

33
import { IJavaRuntime, findRuntimes, getSources } from 'jdk-utils';
4-
import { ExtensionContext, Uri, workspace } from 'vscode';
54

65
let cachedJdks: IJavaRuntime[];
7-
let cachedJreNames: string[];
8-
9-
export async function loadSupportedJreNames(context: ExtensionContext): Promise<void> {
10-
const buffer = await workspace.fs.readFile(Uri.file(context.asAbsolutePath("package.json")));
11-
const packageJson = JSON.parse(buffer.toString());
12-
cachedJreNames = packageJson?.contributes?.configuration?.properties?.["java.configuration.runtimes"]?.items?.properties?.name?.enum;
13-
}
14-
15-
export function getSupportedJreNames(): string[] {
16-
return cachedJreNames;
17-
}
186

197
export async function listJdks(force?: boolean): Promise<IJavaRuntime[]> {
208
if (force || !cachedJdks) {

src/utils.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as path from 'path';
55
import { workspace, WorkspaceConfiguration, commands, Uri, version } from 'vscode';
66
import { Commands } from './commands';
77
import { IJavaRuntime } from 'jdk-utils';
8-
import { getSupportedJreNames, listJdks, sortJdksBySource, sortJdksByVersion } from './jdkUtils';
8+
import { listJdks, sortJdksBySource, sortJdksByVersion } from './jdkUtils';
99

1010
export function getJavaConfiguration(): WorkspaceConfiguration {
1111
return workspace.getConfiguration('java');
@@ -228,7 +228,6 @@ async function addAutoDetectedJdks(configuredJREs: any[]): Promise<any[]> {
228228
sortJdksByVersion(autoDetectedJREs);
229229
sortJdksBySource(autoDetectedJREs);
230230
const addedJreNames: Set<string> = new Set<string>();
231-
const supportedJreNames: string[] = getSupportedJreNames();
232231
for (const jre of configuredJREs) {
233232
if (jre.name) {
234233
addedJreNames.add(jre.name);
@@ -247,7 +246,7 @@ async function addAutoDetectedJdks(configuredJREs: any[]): Promise<any[]> {
247246
jreName = `JavaSE-1.${majorVersion}`;
248247
}
249248

250-
if (addedJreNames.has(jreName) || !supportedJreNames?.includes(jreName)) {
249+
if (addedJreNames.has(jreName)) {
251250
continue;
252251
}
253252

0 commit comments

Comments
 (0)