Merge remote-tracking branch 'origin/master' into fix-vscode-inconsis…

…tency
codota · Dec 6, 2023 · 0eb1028 · 0eb1028
2 parents d6c304c + a4715f4
commit 0eb1028
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 17 deletions.
diff --git a/.chatversion b/.chatversion
@@ -1 +1 @@
-v2.29.0
+v2.30.0
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "publisher": "TabNine",
   "name": "tabnine-vscode",
-  "version": "3.46.0",
+  "version": "3.49.0",
   "displayName": "Tabnine: AI Autocomplete & Chat for Javascript, Python, Typescript, PHP, Go, Java & more",
   "description": "AI coding assistant with AI code completions and AI code chat right in the IDE, helping developers by generating code, writing unit tests and documentation, explaining legacy code, and much more. Tabnine supports all major languages including JavaScript, Python, Java, Typescript c/c++ and more.",
   "icon": "small_logo.png",

diff --git a/src/enterprise/consts.ts b/src/enterprise/consts.ts
@@ -6,13 +6,6 @@ export const SELF_HOSTED_IGNORE_PROXY_CONFIGURATION =
 export const SELF_HOSTED_IGNORE_CERTIFICATE_ERRORS_CONFIGURATION =
   "tabnineSelfHostedUpdater.ignoreCertificateErrors";
 
-export const USE_PROXY_CONFIGURATION = "tabnine.useProxySupport";
-
-export const CA_CERTS_CONFIGURATION = "tabnine.caCerts";
-
-export const IGNORE_CERTIFICATE_ERRORS_CONFIGURATION =
-  "tabnine.ignoreCertificateErrors";
-
 export const TABNINE_HOST_CONFIGURATION = `tabnine.cloudHost`;
 
 export const INSTALL_COMMAND = "workbench.extensions.installExtension";

diff --git a/src/enterprise/extension.ts b/src/enterprise/extension.ts
@@ -22,8 +22,6 @@ import serverUrl from "./update/serverUrl";
 import tabnineExtensionProperties from "../globals/tabnineExtensionProperties";
 import { host } from "../utils/utils";
 import {
-  IGNORE_CERTIFICATE_ERRORS_CONFIGURATION,
-  USE_PROXY_CONFIGURATION,
   RELOAD_COMMAND,
   SELF_HOSTED_IGNORE_CERTIFICATE_ERRORS_CONFIGURATION,
   SELF_HOSTED_IGNORE_PROXY_CONFIGURATION,
@@ -38,6 +36,8 @@ import {
   BRAND_NAME,
   CONFIG_COMMAND,
   ENTERPRISE_BRAND_NAME,
+  IGNORE_CERTIFICATE_ERRORS_CONFIGURATION,
+  USE_PROXY_CONFIGURATION,
 } from "../globals/consts";
 import { StatusBar } from "./statusBar";
 import { isHealthyServer } from "./update/isHealthyServer";
@@ -71,7 +71,7 @@ export async function activate(
     commands.registerCommand(CONFIG_COMMAND, () => {
       void commands.executeCommand(
         OPEN_SETTINGS_COMMAND,
-        `@ext:${EXTENSION_ID}`
+        `@ext:tabnine.${EXTENSION_ID}`
       );
     })
   );

diff --git a/src/globals/consts.ts b/src/globals/consts.ts
@@ -180,3 +180,7 @@ export enum SuggestionTrigger {
 export const TLS_CONFIG_MIN_SUPPORTED_VERSION = "4.22.0";
 export const CONFIG_COMMAND = "TabNine::config";
 export const EXTENSION_ID = "TabNine.tabnine-vscode";
+export const USE_PROXY_CONFIGURATION = "tabnine.useProxySupport";
+export const IGNORE_CERTIFICATE_ERRORS_CONFIGURATION =
+  "tabnine.ignoreCertificateErrors";
+export const CA_CERTS_CONFIGURATION = "tabnine.caCerts";
diff --git a/src/globals/tabnineExtensionProperties.ts b/src/globals/tabnineExtensionProperties.ts
@@ -4,7 +4,7 @@ import {
   CA_CERTS_CONFIGURATION,
   IGNORE_CERTIFICATE_ERRORS_CONFIGURATION,
   USE_PROXY_CONFIGURATION,
-} from "../enterprise/consts";
+} from "./consts";
 
 const TELEMETRY_CONFIG_ID = "telemetry";
 const TELEMETRY_CONFIG_ENABLED_ID = "enableTelemetry";

diff --git a/src/languages/java/JavaHome.ts b/src/languages/java/JavaHome.ts
@@ -1,4 +1,5 @@
 import { extensions } from "vscode";
+import { Logger } from "../../utils/logger";
 
 interface RequirementsData {
   tooling_jre: string;
@@ -11,9 +12,16 @@ interface JavaExtensionAPI {
 }
 
 export function getJavaHomePath(): string | undefined {
-  const javaExension = extensions.getExtension<JavaExtensionAPI>("redhat.java");
-  if (javaExension?.isActive) {
-    return javaExension.exports.javaRequirement.java_home;
+  try {
+    const javaExension = extensions.getExtension<JavaExtensionAPI>(
+      "redhat.java"
+    );
+    if (javaExension?.isActive) {
+      return javaExension.exports.javaRequirement.java_home;
+    }
+    return undefined;
+  } catch (e) {
+    Logger.error(`Failde to get java sdk information: ${e}`);
+    return undefined;
   }
-  return undefined;
 }