Move utility functions to dedicated space

This moves all the utility files to a dedicated folder.
hashicorp · Apr 25, 2022 · 1cf6d08 · 1cf6d08
1 parent ef8d861
commit 1cf6d08
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/src/clientHandler.ts b/src/clientHandler.ts
@@ -10,11 +10,11 @@ import {
   ServerOptions,
   State,
 } from 'vscode-languageclient/node';
-import { ServerPath } from './serverPath';
+import { config } from './utils/vscodeUtils';
+import { ServerPath } from './utils/serverPath';
+import { PartialManifest, CustomSemanticTokens } from './features/semanticTokens';
 import { ShowReferencesFeature } from './features/showReferences';
 import { TelemetryFeature } from './features/telemetry';
-import { config } from './vscodeUtils';
-import { CustomSemanticTokens, PartialManifest } from './features/semanticTokens';
 
 export interface TerraformLanguageClient {
   commandPrefix: string;

diff --git a/src/extension.ts b/src/extension.ts
@@ -7,8 +7,8 @@ import { ClientHandler, TerraformLanguageClient } from './clientHandler';
 import { GenerateBugReportCommand } from './commands/generateBugReport';
 import { ModuleCallsDataProvider } from './providers/moduleCalls';
 import { ModuleProvidersDataProvider } from './providers/moduleProviders';
-import { ServerPath } from './serverPath';
-import { config, getActiveTextEditor, isTerraformFile } from './vscodeUtils';
+import { ServerPath } from './utils/serverPath';
+import { config, getActiveTextEditor, isTerraformFile } from './utils/vscodeUtils';
 
 const brand = `HashiCorp Terraform`;
 const outputChannel = vscode.window.createOutputChannel(brand);

diff --git a/src/installer/detector.ts b/src/installer/detector.ts
@@ -1,5 +1,5 @@
 import * as vscode from 'vscode';
-import { exec } from '../utils';
+import { exec } from '../utils/utils';
 
 export async function getLsVersion(binPath: string): Promise<string | undefined> {
   try {

diff --git a/src/providers/moduleCalls.ts b/src/providers/moduleCalls.ts
@@ -3,7 +3,7 @@ import * as vscode from 'vscode';
 import { ExecuteCommandParams, ExecuteCommandRequest } from 'vscode-languageclient';
 import { Utils } from 'vscode-uri';
 import { ClientHandler } from '../clientHandler';
-import { getActiveTextEditor, isTerraformFile } from '../vscodeUtils';
+import { getActiveTextEditor, isTerraformFile } from '../utils/vscodeUtils';
 
 /* eslint-disable @typescript-eslint/naming-convention */
 interface ModuleCall {

diff --git a/src/providers/moduleProviders.ts b/src/providers/moduleProviders.ts
@@ -3,7 +3,7 @@ import { Utils } from 'vscode-uri';
 import { ExecuteCommandParams, ExecuteCommandRequest } from 'vscode-languageclient';
 
 import { ClientHandler } from '../clientHandler';
-import { getActiveTextEditor, isTerraformFile } from '../vscodeUtils';
+import { getActiveTextEditor, isTerraformFile } from '../utils/vscodeUtils';
 
 /* eslint-disable @typescript-eslint/naming-convention */
 interface ModuleProvidersResponse {

diff --git a/src/test/runTest.ts b/src/test/runTest.ts
@@ -1,7 +1,7 @@
 import * as path from 'path';
 import { runTests } from '@vscode/test-electron';
 import { TestOptions } from '@vscode/test-electron/out/runTest';
-import { exec } from '../utils';
+import { exec } from '../utils/utils';
 
 async function terraformInit() {
   const cwd = process.cwd();

diff --git a/src/test/unit/detector.test.ts b/src/test/unit/detector.test.ts
@@ -1,7 +1,7 @@
-import { exec as execOrg } from '../../utils';
+import { exec as execOrg } from '../../utils/utils';
 import { getLsVersion } from '../../installer/detector';
 
-jest.mock('../../utils');
+jest.mock('../../utils/utils');
 
 const exec = jest.mocked(execOrg);
 

diff --git a/src/serverPath.ts → src/utils/serverPath.ts b/src/serverPath.ts → src/utils/serverPath.ts
diff --git a/src/utils.ts → src/utils/utils.ts b/src/utils.ts → src/utils/utils.ts
diff --git a/src/vscodeUtils.ts → src/utils/vscodeUtils.ts b/src/vscodeUtils.ts → src/utils/vscodeUtils.ts