finish ModuleCall rename

hashicorp · Sep 16, 2021 · 82a2e0b · 82a2e0b
1 parent 6e9b0f6
commit 82a2e0b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -5,7 +5,7 @@ import { LanguageClient } from 'vscode-languageclient/node';
 import { Utils } from 'vscode-uri';
 import { ClientHandler, TerraformLanguageClient } from './clientHandler';
 import { defaultVersionString, isValidVersionString, LanguageServerInstaller } from './languageServerInstaller';
-import { TerraformModuleProvider } from './providers/moduleProvider';
+import { ModuleProvider } from './providers/moduleProvider';
 import { ServerPath } from './serverPath';
 import { SingleInstanceTimeout } from './utils';
 import { config, getActiveTextEditor, prunedFolderNames } from './vscodeUtils';
@@ -138,7 +138,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
 
   vscode.commands.executeCommand('setContext', 'terraform.showModuleView', true);
   context.subscriptions.push(
-    vscode.window.registerTreeDataProvider('terraform.modules', new TerraformModuleProvider(context, clientHandler)),
+    vscode.window.registerTreeDataProvider('terraform.modules', new ModuleProvider(context, clientHandler)),
   );
 
   // export public API

diff --git a/src/providers/moduleProvider.ts b/src/providers/moduleProvider.ts
@@ -8,15 +8,15 @@ const LOCALMODULE = new vscode.ThemeIcon('symbol-folder', new vscode.ThemeColor(
 const TFREGISTRY = new vscode.ThemeIcon('extensions-view-icon', new vscode.ThemeColor('terminal.ansiBrightMagenta'));
 const GITHUBMODULE = new vscode.ThemeIcon('github');
 
-class TerraformModule extends vscode.TreeItem {
+class ModuleCall extends vscode.TreeItem {
   constructor(
     public label: string,
     public provider: string,
     public version: string,
     public type: string,
     public doclink: string,
     public state: vscode.TreeItemCollapsibleState,
-    public readonly children?: [TerraformModule],
+    public readonly children?: [ModuleCall],
   ) {
     super(label, state);
     if (this.version != '') {
@@ -58,15 +58,15 @@ class TerraformModule extends vscode.TreeItem {
 }
 
 export class ModuleProvider implements vscode.TreeDataProvider<ModuleCall> {
-  private _onDidChangeTreeData: vscode.EventEmitter<TerraformModule | undefined | null | void> =
-    new vscode.EventEmitter<TerraformModule | undefined | null | void>();
-  readonly onDidChangeTreeData: vscode.Event<TerraformModule | undefined | null | void> =
-    this._onDidChangeTreeData.event;
+  private _onDidChangeTreeData: vscode.EventEmitter<ModuleCall | undefined | null | void> = new vscode.EventEmitter<
+    ModuleCall | undefined | null | void
+  >();
+  readonly onDidChangeTreeData: vscode.Event<ModuleCall | undefined | null | void> = this._onDidChangeTreeData.event;
 
   constructor(ctx: vscode.ExtensionContext, public handler: ClientHandler) {
     ctx.subscriptions.push(
       vscode.commands.registerCommand('terraform.modules.refreshList', () => this.refresh()),
-      vscode.commands.registerCommand('terraform.modules.openDocumentation', (module: TerraformModule) => {
+      vscode.commands.registerCommand('terraform.modules.openDocumentation', (module: ModuleCall) => {
         vscode.env.openExternal(vscode.Uri.parse(module.doclink));
       }),
       vscode.window.onDidChangeActiveTextEditor(async (event: vscode.TextEditor | undefined) => {
@@ -81,11 +81,11 @@ export class ModuleProvider implements vscode.TreeDataProvider<ModuleCall> {
     this._onDidChangeTreeData.fire();
   }
 
-  getTreeItem(element: TerraformModule): TerraformModule | Thenable<TerraformModule> {
+  getTreeItem(element: ModuleCall): ModuleCall | Thenable<ModuleCall> {
     return element;
   }
 
-  getChildren(element?: TerraformModule): vscode.ProviderResult<TerraformModule[]> {
+  getChildren(element?: ModuleCall): vscode.ProviderResult<ModuleCall[]> {
     if (element) {
       return Promise.resolve(element.children);
     } else {
@@ -107,7 +107,7 @@ export class ModuleProvider implements vscode.TreeDataProvider<ModuleCall> {
     }
   }
 
-  async getModules(): Promise<TerraformModule[]> {
+  async getModules(): Promise<ModuleCall[]> {
     const activeEditor = vscode.window.activeTextEditor;
     if (activeEditor === undefined) {
       return Promise.resolve([]);
@@ -134,12 +134,12 @@ export class ModuleProvider implements vscode.TreeDataProvider<ModuleCall> {
       }
 
       const list = response.modules.map((m) => {
-        let deps: [TerraformModule];
+        let deps: [ModuleCall];
         if (m.depmodules === null) {
           deps = null;
         } else {
           deps = m.depmodules.map((dp) => {
-            return new TerraformModule(
+            return new ModuleCall(
               dp.name,
               dp.path,
               dp.version,
@@ -152,7 +152,7 @@ export class ModuleProvider implements vscode.TreeDataProvider<ModuleCall> {
 
         const state = this.getCollapseState(m.type);
 
-        return new TerraformModule(m.name, m.path, m.version, m.type, m.docklink, state, deps);
+        return new ModuleCall(m.name, m.path, m.version, m.type, m.docklink, state, deps);
       });
 
       return list;