Rename views to ui

worksofliam · worksofliam · commit e582b1eb8e2e · 2025-01-15T10:23:49.000-05:00
Signed-off-by: worksofliam &lt;mrliamallan@live.co.uk&gt;
diff --git a/src/Instance.ts b/src/Instance.ts
@@ -2,8 +2,8 @@ import * as vscode from "vscode";
 import { ConnectionData, IBMiEvent } from "./typings";
 import IBMi, { ConnectionResult } from "./api/IBMi";
 import { CodeForIStorage, ConnectionStorage } from "./api/configuration/Storage";
-import { withContext } from "./views/tools";
-import { handleConnectionResults, messageCallback } from "./views/connection";
+import { withContext } from "./ui/tools";
+import { handleConnectionResults, messageCallback } from "./ui/connection";
 import { VsStorage } from "./config/Storage";
 import { VsCodeConfig } from "./config/Configuration";
 import { ConnectionConfig } from "./api/configuration/ConnectionManager";
diff --git a/src/commands/actions.ts b/src/commands/actions.ts
@@ -1,11 +1,11 @@
 import path from "path";
 import { commands, TreeItem, Uri, WorkspaceFolder, window, Disposable } from "vscode";
-import { refreshDiagnosticsFromServer } from "../views/diagnostics";
+import { refreshDiagnosticsFromServer } from "../ui/diagnostics";
 import Instance from "../Instance";
 import { Action, DeploymentMethod } from "../typings";
-import { runAction } from "../views/actions";
+import { runAction } from "../ui/actions";
 import IBMi from "../api/IBMi";
-import { BrowserItem } from "../views/types";
+import { BrowserItem } from "../ui/types";
 
 export function registerActionsCommands(instance: Instance): Disposable[] {
   return [
diff --git a/src/commands/open.ts b/src/commands/open.ts
@@ -4,7 +4,7 @@ import Instance from "../Instance";
 import { Tools } from "../api/Tools";
 import { getUriFromPath, parseFSOptions } from "../filesystems/qsys/QSysFs";
 import path from "path";
-import { findExistingDocument, findExistingDocumentUri } from "../views/tools";
+import { findExistingDocument, findExistingDocumentUri } from "../ui/tools";
 import IBMi from "../api/IBMi";
 import { DefaultOpenMode } from "../api/configuration/ConnectionManager";
 
diff --git a/src/debug/certificates.ts b/src/debug/certificates.ts
@@ -8,7 +8,7 @@ import { instance } from '../instantiate';
 import IBMi from "../api/IBMi";
 import IBMiContent from '../api/IBMiContent';
 import { Tools } from '../api/Tools';
-import { fileToPath } from '../views/tools';
+import { fileToPath } from '../ui/tools';
 import { DebugConfiguration, SERVICE_CERTIFICATE, CLIENT_CERTIFICATE, getDebugServiceDetails, getJavaHome, DEBUG_CONFIG_FILE, LEGACY_CERT_DIRECTORY } from '../api/configuration/DebugConfiguration';
 
 type HostInfo = {
diff --git a/src/debug/index.ts b/src/debug/index.ts
@@ -11,7 +11,7 @@ import { Env, getEnvConfig } from "../filesystems/local/env";
 import * as certificates from "./certificates";
 import { DEBUG_CONFIG_FILE, DebugConfiguration, getDebugServiceDetails, resetDebugServiceDetails } from "../api/configuration/DebugConfiguration";
 import * as server from "./server";
-import { withContext } from "../views/tools";
+import { withContext } from "../ui/tools";
 import { getStoredPassword } from "../config/passwords";
 
 const debugExtensionId = `IBM.ibmidebug`;
diff --git a/src/extension.ts b/src/extension.ts
@@ -22,16 +22,16 @@ import { LocalActionCompletionItemProvider } from "./languages/actions/completio
 import * as Sandbox from "./sandbox";
 import { initialise } from "./testing";
 import { CodeForIBMi, ConnectionData } from "./typings";
-import { initializeConnectionBrowser } from "./views/ConnectionBrowser";
-import { LibraryListProvider } from "./views/LibraryListView";
-import { ProfilesView } from "./views/ProfilesView";
-import { initializeDebugBrowser } from "./views/debugView";
-import { HelpView } from "./views/helpView";
-import { initializeIFSBrowser } from "./views/ifsBrowser";
-import { initializeObjectBrowser } from "./views/objectBrowser";
-import { initializeSearchView } from "./views/searchView";
+import { initializeConnectionBrowser } from "./ui/views/ConnectionBrowser";
+import { LibraryListProvider } from "./ui/views/LibraryListView";
+import { ProfilesView } from "./ui/views/ProfilesView";
+import { initializeDebugBrowser } from "./ui/views/debugView";
+import { HelpView } from "./ui/views/helpView";
+import { initializeIFSBrowser } from "./ui/views/ifsBrowser";
+import { initializeObjectBrowser } from "./ui/views/objectBrowser";
+import { initializeSearchView } from "./ui/views/searchView";
 import { SettingsUI } from "./webviews/settings";
-import { registerActionTools } from "./views/actions";
+import { registerActionTools } from "./ui/actions";
 import IBMi from "./api/IBMi";
 import path from "path";
 
diff --git a/src/filesystems/local/deployTools.ts b/src/filesystems/local/deployTools.ts
@@ -4,7 +4,7 @@ import vscode, { Uri, WorkspaceFolder } from 'vscode';
 import { instance } from '../../instantiate';
 import { LocalLanguageActions } from './LocalLanguageActions';
 import { Deployment } from './deployment';
-import { getGitAPI, md5Hash } from '../../views/tools';
+import { getGitAPI, md5Hash } from '../../ui/tools';
 import { DeploymentMethod } from '../../api/types';
 import { DeploymentParameters } from '../../typings';
 
diff --git a/src/filesystems/local/git.ts b/src/filesystems/local/git.ts
@@ -3,7 +3,7 @@ import { getBranchLibraryName } from "./env";
 import { instance } from "../../instantiate";
 import IBMi from "../../api/IBMi";
 import IBMiContent from "../../api/IBMiContent";
-import { getGitAPI } from "../../views/tools";
+import { getGitAPI } from "../../ui/tools";
 import { ConnectionConfig } from "../../api/configuration/ConnectionManager";
 
 const lastBranch: { [workspaceUri: string]: string } = {};
diff --git a/src/filesystems/qsys/FSUtils.ts b/src/filesystems/qsys/FSUtils.ts
@@ -1,6 +1,6 @@
 import path from "path";
 import vscode, { l10n } from "vscode";
-import { findUriTabs } from "../../views/tools";
+import { findUriTabs } from "../../ui/tools";
 import IBMi from "../../api/IBMi";
 import { ReconnectMode } from "../../api/configuration/ConnectionManager";
 
diff --git a/src/instantiate.ts b/src/instantiate.ts
@@ -2,7 +2,7 @@
 import * as vscode from "vscode";
 import { onCodeForIBMiConfigurationChange } from "./config/Configuration";
 import Instance from "./Instance";
-import { Terminal } from './views/Terminal';
+import { Terminal } from './ui/Terminal';
 import { getDebugServiceDetails } from './api/configuration/DebugConfiguration';
 import { debugPTFInstalled, isDebugEngineRunning } from './debug/server';
 import { setupGitEventHandler } from './filesystems/local/git';
diff --git a/src/sandbox.ts b/src/sandbox.ts
@@ -3,7 +3,7 @@ import querystring from "querystring";
 import { commands, ExtensionContext, l10n, Uri, window } from "vscode";
 import { instance } from "./instantiate";
 import { ConnectionData } from "./typings";
-import { getGitAPI } from "./views/tools";
+import { getGitAPI } from "./ui/tools";
 import IBMi from "./api/IBMi";
 
 export async function registerUriHandler(context: ExtensionContext) {
diff --git a/src/testing/action.ts b/src/testing/action.ts
@@ -11,7 +11,7 @@ import { getMemberUri, getUriFromPath } from "../filesystems/qsys/QSysFs";
 import { instance } from "../instantiate";
 import { Action, IBMiObject } from "../typings";
 import { File, Folder, createFolder } from "./deployTools";
-import { runAction } from "../views/actions";
+import { runAction } from "../ui/actions";
 
 export const helloWorldProject: Folder = {
   name: `DeleteMe_${Tools.makeid()}`,
diff --git a/src/testing/deployTools.ts b/src/testing/deployTools.ts
@@ -10,8 +10,8 @@ import { Tools } from "../api/Tools";
 import { DeployTools } from "../filesystems/local/deployTools";
 import { instance } from "../instantiate";
 import { Action, DeploymentMethod } from "../typings";
-import { md5Hash } from "../views/tools";
-import { runAction } from "../views/actions";
+import { md5Hash } from "../ui/tools";
+import { runAction } from "../ui/actions";
 
 type FileInfo = {
     md5: string
diff --git a/src/typings.ts b/src/typings.ts
@@ -38,5 +38,5 @@ export interface DeploymentParameters {
 }
 
 export * from "./api/types";
-export * from "./views/types";
+export * from "./ui/types";
 export * from "./filesystems/local/types";
diff --git a/src/ui/Terminal.ts b/src/ui/Terminal.ts
diff --git a/src/ui/actions.ts b/src/ui/actions.ts
diff --git a/src/ui/connection.ts b/src/ui/connection.ts
diff --git a/src/ui/diagnostics.ts b/src/ui/diagnostics.ts
diff --git a/src/ui/tools.ts b/src/ui/tools.ts
diff --git a/src/ui/types.ts b/src/ui/types.ts
diff --git a/src/ui/views/ConnectionBrowser.ts b/src/ui/views/ConnectionBrowser.ts
@@ -1,11 +1,11 @@
 import vscode from 'vscode';
-import { ConnectionData, Server } from '../typings';
+import { ConnectionData, Server } from '../../typings';
 
-import { instance } from '../instantiate';
-import { Login } from '../webviews/login';
-import IBMi from '../api/IBMi';
-import { ConnectionConfig, ConnectionManager } from '../api/configuration/ConnectionManager';
-import { deleteStoredPassword, getStoredPassword, setStoredPassword } from '../config/passwords';
+import { instance } from '../../instantiate';
+import { Login } from '../../webviews/login';
+import IBMi from '../../api/IBMi';
+import { ConnectionConfig, ConnectionManager } from '../../api/configuration/ConnectionManager';
+import { deleteStoredPassword, getStoredPassword, setStoredPassword } from '../../config/passwords';
 
 type CopyOperationItem = {
   label: string
diff --git a/src/ui/views/LibraryListView.ts b/src/ui/views/LibraryListView.ts
@@ -1,9 +1,9 @@
 import vscode, { commands, l10n } from "vscode";
-import { instance } from "../instantiate";
-import { IBMiObject, WithLibrary } from "../typings";
-import { objectToToolTip } from "./tools";
-import { ConnectionConfig } from "../api/configuration/ConnectionManager";
-import IBMi from "../api/IBMi";
+import { instance } from "../../instantiate";
+import { IBMiObject, WithLibrary } from "../../typings";
+import { objectToToolTip } from "../tools";
+import { ConnectionConfig } from "../../api/configuration/ConnectionManager";
+import IBMi from "../../api/IBMi";
 
 export class LibraryListProvider implements vscode.TreeDataProvider<LibraryListNode> {
   private readonly _emitter: vscode.EventEmitter<LibraryListNode | undefined | null | void> = new vscode.EventEmitter();
diff --git a/src/ui/views/ProfilesView.ts b/src/ui/views/ProfilesView.ts
@@ -1,11 +1,11 @@
 
 import vscode, { l10n, window } from 'vscode';
-import { GetNewLibl } from '../api/components/getNewLibl';
-import { instance } from '../instantiate';
-import { Profile } from '../typings';
-import { CommandProfileUi } from '../webviews/commandProfile';
-import IBMi from '../api/IBMi';
-import { ConnectionProfile } from '../api/configuration/ConnectionManager';
+import { GetNewLibl } from '../../api/components/getNewLibl';
+import { instance } from '../../instantiate';
+import { Profile } from '../../typings';
+import { CommandProfileUi } from '../../webviews/commandProfile';
+import IBMi from '../../api/IBMi';
+import { ConnectionProfile } from '../../api/configuration/ConnectionManager';
 
 export class ProfilesView {
   private _onDidChangeTreeData = new vscode.EventEmitter<vscode.TreeItem | undefined | null | void>();
diff --git a/src/ui/views/debugView.ts b/src/ui/views/debugView.ts
@@ -1,11 +1,11 @@
 import vscode from "vscode";
-import { Tools } from "../api/Tools";
-import { checkClientCertificate, debugKeyFileExists, remoteCertificatesExists } from "../debug/certificates";
-import { DebugConfiguration, getDebugServiceDetails, SERVICE_CERTIFICATE } from "../api/configuration/DebugConfiguration";
-import { DebugJob, getDebugServerJob, getDebugServiceJob, isDebugEngineRunning, readActiveJob, readJVMInfo, startServer, startService, stopServer, stopService } from "../debug/server";
-import { instance } from "../instantiate";
-import { withContext } from "./tools";
-import { BrowserItem } from "./types";
+import { Tools } from "../../api/Tools";
+import { checkClientCertificate, debugKeyFileExists, remoteCertificatesExists } from "../../debug/certificates";
+import { DebugConfiguration, getDebugServiceDetails, SERVICE_CERTIFICATE } from "../../api/configuration/DebugConfiguration";
+import { DebugJob, getDebugServerJob, getDebugServiceJob, isDebugEngineRunning, readActiveJob, readJVMInfo, startServer, startService, stopServer, stopService } from "../../debug/server";
+import { instance } from "../../instantiate";
+import { withContext } from "../tools";
+import { BrowserItem } from "../types";
 
 const title = "IBM i debugger";
 type Certificates = {
diff --git a/src/ui/views/helpView.ts b/src/ui/views/helpView.ts
@@ -2,9 +2,9 @@
 import AdmZip from 'adm-zip';
 import path, { parse } from 'path';
 import vscode from 'vscode';
-import { DebugConfiguration } from '../api/configuration/DebugConfiguration';
-import IBMi from '../api/IBMi';
-import { instance } from '../instantiate';
+import { DebugConfiguration } from '../../api/configuration/DebugConfiguration';
+import IBMi from '../../api/IBMi';
+import { instance } from '../../instantiate';
 
 export class HelpView implements vscode.TreeDataProvider<vscode.TreeItem> {
   private _onDidChangeTreeData = new vscode.EventEmitter<vscode.TreeItem | undefined | null | void>();
diff --git a/src/ui/views/ifsBrowser.ts b/src/ui/views/ifsBrowser.ts
@@ -3,14 +3,14 @@ import path, { dirname, extname } from "path";
 import vscode, { FileType, l10n, window } from "vscode";
 
 import { existsSync, mkdirSync, rmdirSync } from "fs";
-import { SortOptions } from "../api/IBMiContent";
-import { Search } from "../api/Search";
-import { Tools } from "../api/Tools";
-import { instance } from "../instantiate";
-import { FocusOptions, IFSFile, IFS_BROWSER_MIMETYPE, OBJECT_BROWSER_MIMETYPE, SearchHit, SearchResults, WithPath } from "../typings";
-import { fileToPath, findUriTabs, ifsFileToToolTip } from "./tools";
-import IBMi from "../api/IBMi";
-import { BrowserItem, BrowserItemParameters } from "./types";
+import { SortOptions } from "../../api/IBMiContent";
+import { Search } from "../../api/Search";
+import { Tools } from "../../api/Tools";
+import { instance } from "../../instantiate";
+import { FocusOptions, IFSFile, IFS_BROWSER_MIMETYPE, OBJECT_BROWSER_MIMETYPE, SearchHit, SearchResults, WithPath } from "../../typings";
+import { fileToPath, findUriTabs, ifsFileToToolTip } from "../tools";
+import IBMi from "../../api/IBMi";
+import { BrowserItem, BrowserItemParameters } from "../types";
 
 const URI_LIST_MIMETYPE = "text/uri-list";
 const URI_LIST_SEPARATOR = "\r\n";
diff --git a/src/ui/views/objectBrowser.ts b/src/ui/views/objectBrowser.ts
@@ -2,18 +2,18 @@ import fs, { existsSync } from "fs";
 import os from "os";
 import path, { basename, dirname } from "path";
 import vscode from "vscode";
-import { parseFilter, singleGenericName } from "../api/Filter";
-import IBMi, { MemberParts } from "../api/IBMi";
-import { SortOptions, SortOrder } from "../api/IBMiContent";
-import { Search } from "../api/Search";
-import { Tools } from "../api/Tools";
-import { getMemberUri } from "../filesystems/qsys/QSysFs";
-import { instance } from "../instantiate";
-import { CommandResult, FilteredItem, FocusOptions, IBMiMember, IBMiObject, MemberItem, OBJECT_BROWSER_MIMETYPE, ObjectItem, WithLibrary } from "../typings";
-import { editFilter } from "../webviews/filters";
-import { findUriTabs, memberToToolTip, objectToToolTip, sourcePhysicalFileToToolTip } from "./tools";
-import { DefaultOpenMode, ObjectFilters } from "../api/configuration/ConnectionManager";
-import { BrowserItem, BrowserItemParameters } from "./types";
+import { parseFilter, singleGenericName } from "../../api/Filter";
+import IBMi, { MemberParts } from "../../api/IBMi";
+import { SortOptions, SortOrder } from "../../api/IBMiContent";
+import { Search } from "../../api/Search";
+import { Tools } from "../../api/Tools";
+import { getMemberUri } from "../../filesystems/qsys/QSysFs";
+import { instance } from "../../instantiate";
+import { CommandResult, FilteredItem, FocusOptions, IBMiMember, IBMiObject, MemberItem, OBJECT_BROWSER_MIMETYPE, ObjectItem, WithLibrary } from "../../typings";
+import { editFilter } from "../../webviews/filters";
+import { findUriTabs, memberToToolTip, objectToToolTip, sourcePhysicalFileToToolTip } from "../tools";
+import { DefaultOpenMode, ObjectFilters } from "../../api/configuration/ConnectionManager";
+import { BrowserItem, BrowserItemParameters } from "../types";
 
 const URI_LIST_SEPARATOR = "\r\n";
 
diff --git a/src/ui/views/searchView.ts b/src/ui/views/searchView.ts
@@ -1,7 +1,7 @@
 import path from 'path';
 import vscode from "vscode";
-import { SearchHit, SearchHitLine, SearchResults, WithPath } from "../typings";
-import { DefaultOpenMode } from '../api/configuration/ConnectionManager';
+import { SearchHit, SearchHitLine, SearchResults, WithPath } from "../../typings";
+import { DefaultOpenMode } from '../../api/configuration/ConnectionManager';
 
 export function initializeSearchView(context: vscode.ExtensionContext) {
   const searchView = new SearchView();
diff --git a/src/webviews/settings/index.ts b/src/webviews/settings/index.ts
@@ -8,7 +8,7 @@ import { isSEPSupported } from "../../debug/server";
 import { extensionComponentRegistry } from "../../api/components/manager";
 import { instance } from "../../instantiate";
 import { ConnectionData, Server } from '../../typings';
-import { withContext } from "../../views/tools";
+import { withContext } from "../../ui/tools";
 import IBMi from "../../api/IBMi";
 import { ConnectionConfig, ConnectionManager } from "../../api/configuration/ConnectionManager";
 import { deleteStoredPassword, getStoredPassword, setStoredPassword } from "../../config/passwords";
