Fixed import issues and refactored util functions

Author: Achal1607

vscode/src/commands/create.ts

@@ -22,7 +22,7 @@ import * as fs from 'fs';
 import { ICommand } from "./types";
 import { globalVars } from "../extension";
 import { getContextUri, isNbCommandRegistered } from "./utils";
-import { isString } from "../typesUtil";
+import { isString } from "../utils";
 
 const newFromTemplate = async (ctx: any, template: any) => {
     const client: LanguageClient = await globalVars.clientPromise.client;

vscode/src/extension.ts

@@ -60,7 +60,6 @@ export namespace globalVars {
 
 
 export function activate(context: ExtensionContext): VSNetBeansAPI {
-    globalVars.deactivated = false;
     globalVars.clientPromise = new ClientPromise();
     globalVars.extensionInfo = new ExtensionInfo(context);
     LOGGER = new ExtensionLogger(extConstants.SERVER_NAME);

vscode/src/lsp/initializer.ts

@@ -105,7 +105,8 @@ const serverBuilder = () => {
 }
 
 export const clientInit = () => {
-    const connection: () => Promise<StreamInfo> = serverOptionsBuilder();
+    globalVars.deactivated = false;
+    const connection: () => Promise<StreamInfo> = serverBuilder();
     const client = NbLanguageClient.build(connection, LOGGER);
 
     LOGGER.log('Language Client: Starting');

vscode/src/lsp/launchOptions.ts

@@ -16,7 +16,7 @@
 import { builtInConfigKeys, configKeys } from "../configurations/configuration"
 import { isDarkColorThemeHandler, isNbJavacDisabledHandler, jdkHomeValueHandler, lspServerVmOptionsHandler, projectSearchRootsValueHandler, userdirHandler } from "../configurations/handlers";
 import { l10n } from "../localiser";
-import { isString } from "../typesUtil";
+import { isString } from "../utils";
 import { userDefinedLaunchOptionsType } from "./types"
 
 export const getUserConfigLaunchOptionsDefaults = (): userDefinedLaunchOptionsType => {

vscode/src/lsp/listeners/notifications/handlers.ts

@@ -14,14 +14,14 @@
   limitations under the License.
 */
 import { LogMessageNotification, MessageType, TelemetryEventNotification } from "vscode-languageclient";
-import { notificationOrRequestListenerType } from "../types";
-import { asRanges, ShowStatusMessageParams, StatusMessageRequest, TestProgressNotification, TextEditorDecorationDisposeNotification, TextEditorDecorationSetNotification } from "../protocol";
+import { notificationOrRequestListenerType } from "../../types";
+import { asRanges, ShowStatusMessageParams, StatusMessageRequest, TestProgressNotification, TextEditorDecorationDisposeNotification, TextEditorDecorationSetNotification } from "../../protocol";
 import { commands, window, workspace } from "vscode";
-import { isNbJavacDisabledHandler, updateConfigurationValue } from "../../configurations/handlers";
-import { l10n } from "../../localiser";
-import { configKeys } from "../../configurations/configuration";
-import { builtInCommands } from "../../commands/commands";
-import { globalVars, LOGGER } from "../../extension";
+import { isNbJavacDisabledHandler, updateConfigurationValue } from "../../../configurations/handlers";
+import { l10n } from "../../../localiser";
+import { configKeys } from "../../../configurations/configuration";
+import { builtInCommands } from "../../../commands/commands";
+import { globalVars, LOGGER } from "../../../extension";
 
 const checkInstallNbJavac = (msg: string) => {
     const NO_JAVA_SUPPORT = "Cannot initialize Java support";

vscode/src/lsp/listeners/notifications/register.ts

@@ -13,8 +13,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-import { NbLanguageClient } from "../nbLanguageClient"
-import { notificationOrRequestListenerType } from "../types"
+
+import { NbLanguageClient } from "../../nbLanguageClient"
+import { notificationOrRequestListenerType } from "../../types"
 import { notificationListeners } from "./handlers"
 
 export const registerNotificationListeners = (client: NbLanguageClient) => {

vscode/src/lsp/listeners/requests/handlers.ts

@@ -14,14 +14,15 @@
   limitations under the License.
 */
 import { QuickPickItem, Uri, window, workspace, WorkspaceConfiguration } from "vscode";
-import { globalVars, LOGGER } from "../../extension";
-import { notificationOrRequestListenerType } from "../types";
-import { ExecInHtmlPageRequest, HtmlPageRequest, InputBoxRequest, InputBoxStep, MutliStepInputRequest, QuickPickRequest, QuickPickStep, SaveDocumentRequestParams, SaveDocumentsRequest, TextEditorDecorationCreateRequest, UpdateConfigurationRequest } from "../protocol";
-import { InputStep, MultiStepInput } from "../../utils";
-import { runConfigurationUpdateAll } from "../../runConfiguration";
-import { isError, isString } from "../../typesUtil";
-import { LogLevel } from "../../logger";
-import { execInHtmlPage, showHtmlPage } from "../../webviews/nbWebviewHandler";
+import { globalVars, LOGGER } from "../../../extension";
+import { notificationOrRequestListenerType } from "../../types";
+import { ExecInHtmlPageRequest, HtmlPageRequest, InputBoxRequest, InputBoxStep, MutliStepInputRequest, QuickPickRequest, QuickPickStep, SaveDocumentRequestParams, SaveDocumentsRequest, TextEditorDecorationCreateRequest, UpdateConfigurationRequest } from "../../protocol";
+import { InputStep, MultiStepInput } from "../../../utils";
+import { runConfigurationUpdateAll } from "../../../runConfiguration";
+import { isError } from "../../../utils";
+import { isString } from "../../../utils";
+import { LogLevel } from "../../../logger";
+import { execInHtmlPage, showHtmlPage } from "../../../webviews/nbWebviewHandler";
 
 const textEditorDecorationCreateRequestHandler = (param: any) => {
     let decorationType = window.createTextEditorDecorationType(param);

vscode/src/lsp/listeners/requests/register.ts

@@ -13,8 +13,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-import { NbLanguageClient } from "../nbLanguageClient"
-import { notificationOrRequestListenerType } from "../types"
+
+import { NbLanguageClient } from "../../nbLanguageClient"
+import { notificationOrRequestListenerType } from "../../types"
 import { requestListeners } from "./handlers"
 
 export const registerRequestListeners = (client: NbLanguageClient) => {

vscode/src/lsp/utils.ts

@@ -17,8 +17,6 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 import { globalVars, LOGGER } from '../extension';
-import { TextDocumentFilter } from 'vscode-languageclient';
-import { extensions } from 'vscode';
 import { extConstants } from '../constants';
 
 export const enableDisableModules = (