Improved checking of enablement for content assist

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

package.json

@@ -1233,4 +1233,4 @@
       }
     ]
   }
-}
+}

src/language/providers/available.ts

@@ -0,0 +1,12 @@
+
+import { env } from "process";
+import { ServerComponent } from "../../connection/serverComponent";
+import { JobManager } from "../../config";
+
+export function localAssistIsEnabled() {
+  return (env.DB2I_DISABLE_CA !== `true`);
+}
+
+export function remoteAssistIsEnabled() {
+  return localAssistIsEnabled() && ServerComponent.isInstalled() && JobManager.getSelection() !== undefined;
+}

src/language/providers/completionProvider.ts

@@ -13,10 +13,10 @@ import { CTEReference, CallableReference, ClauseType, ObjectRef, StatementType }
 import CompletionItemCache, { changedCache } from "./completionItemCache";
 import Callable, { CallableType } from "../../database/callable";
 import { ServerComponent } from "../../connection/serverComponent";
-import { env } from "process";
 import { prepareParamType, createCompletionItem, getParmAttributes, completionItemCache } from "./completion";
 import { isCallableType, getCallableParameters } from "./callable";
 import { variable } from "sql-formatter/lib/src/lexer/regexFactory";
+import { localAssistIsEnabled, remoteAssistIsEnabled } from "./available";
 
 export interface CompletionType {
   order: string;
@@ -59,10 +59,6 @@ const completionTypes: { [index: string]: CompletionType } = {
 };
 
 
-function isEnabled() {
-  return (env.DB2I_DISABLE_CA !== `true`);
-}
-
 
 function getColumnAttributes(column: TableColumn): string {
   const lines: string[] = [
@@ -613,7 +609,7 @@ export const completionProvider = languages.registerCompletionItemProvider(
   `sql`,
   {
     async provideCompletionItems(document, position, token, context) {
-      if (isEnabled()) {
+      if (localAssistIsEnabled()) {
         const trigger = context.triggerCharacter;
         const content = document.getText();
         const offset = document.offsetAt(position);
@@ -627,7 +623,7 @@ export const completionProvider = languages.registerCompletionItemProvider(
           allItems.push(...getLocalDefs(sqlDoc, offset))
         }
 
-        if (ServerComponent.isInstalled() && currentStatement) {
+        if (remoteAssistIsEnabled() && currentStatement) {
           allItems.push(...await getCompletionItems(trigger, currentStatement, offset))
         }
 

src/language/providers/parameterProvider.ts

@@ -5,14 +5,14 @@ import { getCachedSignatures, getCallableParameters, getPositionData, isCallable
 import { getParmAttributes, prepareParamType } from "./completion";
 import { CallableType } from "../../database/callable";
 import { StatementType } from "../sql/types";
-import { ServerComponent } from "../../connection/serverComponent";
+import { remoteAssistIsEnabled } from "./available";
 
 export const signatureProvider = languages.registerSignatureHelpProvider({ language: `sql` }, {
   async provideSignatureHelp(document, position, token, context) {
     const content = document.getText();
     const offset = document.offsetAt(position);
 
-    if (ServerComponent.isInstalled()) {
+    if (remoteAssistIsEnabled()) {
 
       const sqlDoc = new Document(content);
       const currentStatement = sqlDoc.getStatementByOffset(offset);