Skip to content

Commit

Permalink
DEV2-2933 use java home (#1141)
Browse files Browse the repository at this point in the history
* DEV2-2933 use java home

* remove last

* rename

* rename
  • Loading branch information
dimacodota authored Jun 12, 2023
1 parent fb321cf commit 4f352a5
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 1 deletion.
1 change: 0 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"args": [
"--extensionDevelopmentPath=${workspaceRoot}",
"--logPluginHostCommunication",
"--disable-extensions"
],

"sourceMaps": true,
Expand Down
8 changes: 8 additions & 0 deletions src/languages/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { getJavaHomePath } from "./java/JavaHome";

export function getSDKPath(languageId: string): string | undefined {
if (languageId === "java") {
return getJavaHomePath();
}
return undefined;
}
19 changes: 19 additions & 0 deletions src/languages/java/JavaHome.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { extensions } from "vscode";

interface RequirementsData {
tooling_jre: string;
tooling_jre_version: number;
java_home: string;
java_version: number;
}
interface JavaExtensionAPI {
readonly javaRequirement: RequirementsData;
}

export function getJavaHomePath(): string | undefined {
const javaExension = extensions.getExtension<JavaExtensionAPI>("redhat.java");
if (javaExension?.isActive) {
return javaExension.exports.javaRequirement.java_home;
}
return undefined;
}
3 changes: 3 additions & 0 deletions src/runCompletion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
MAX_NUM_RESULTS,
} from "./globals/consts";
import languages from "./globals/languages";
import { getSDKPath } from "./languages";

export default async function runCompletion({
document,
Expand Down Expand Up @@ -48,7 +49,9 @@ export default async function runCompletion({
line: position.line,
character: position.character,
indentation_size: getTabSize(),
sdk_path: getSDKPath(document.languageId),
};

const isEmptyLine = document.lineAt(position.line).text.trim().length === 0;

const result = await autocomplete(
Expand Down

0 comments on commit 4f352a5

Please sign in to comment.