Code cleanup

Author: isc-bsaviano

src/commands/compile.ts

@@ -318,11 +318,11 @@ export async function importFolder(uri: vscode.Uri, noCompile = false): Promise<
   if (fs.lstatSync(uripath).isFile()) {
     return importFiles([uripath], noCompile);
   }
-  var globpattern = "*.{cls,inc,int,mac}";
+  let globpattern = "*.{cls,inc,int,mac}";
   const workspace = currentWorkspaceFolder();
   const workspacePath = workspaceFolderUri(workspace).fsPath;
   const { folder } = config("export", workspace);
-  const folderPathNoWorkspaceArr = uripath.replace(workspacePath+path.sep,'').split(path.sep);
+  const folderPathNoWorkspaceArr = uripath.replace(workspacePath + path.sep, "").split(path.sep);
   if (folderPathNoWorkspaceArr[0] === folder) {
     // This folder is in the export tree, so import all files
     // We need to include eveything becuase CSP applications can

src/commands/export.ts

@@ -50,8 +50,7 @@ export const getFileName = (
     const nameArr: string[] = name.split("/");
     const cat = addCategory ? getCategory(name, addCategory) : null;
     return [folder, cat, ...nameArr].filter(notNull).join(path.sep);
-  }
-  else {
+  } else {
     // This is a class, routine or include file
     if (map) {
       for (const pattern of Object.keys(map)) {
@@ -134,23 +133,18 @@ export async function exportFile(
             if (Buffer.isBuffer(content)) {
               // This is a binary file
               let isSkipped = "";
-              
               if (dontExportIfNoChanges && fs.existsSync(fileName)) {
                 const existingContent = fs.readFileSync(fileName);
                 if (content.equals(existingContent)) {
                   fs.writeFileSync(fileName, content);
-                }
-                else {
+                } else {
                   isSkipped = " => skipped - no changes.";
                 }
-              }
-              else {
+              } else {
                 fs.writeFileSync(fileName, content);
               }
-
               log(`Success ${isSkipped}`);
-            }
-            else {
+            } else {
               // This is a text file
               let joinedContent = content.join("\n");
               let isSkipped = "";

src/extension.ts

@@ -75,7 +75,7 @@ import {
   notNull,
   currentFile,
   InputBoxManager,
-  isImportableLocalFile
+  isImportableLocalFile,
 } from "./utils";
 import { ObjectScriptDiagnosticProvider } from "./providers/ObjectScriptDiagnosticProvider";
 import { DocumentRangeFormattingEditProvider } from "./providers/DocumentRangeFormattingEditProvider";
@@ -522,10 +522,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       if (documentBeingProcessed !== file) {
         return importAndCompile(false, file);
       }
-    }
-    else if (file.uri.scheme === "file") {
+    } else if (file.uri.scheme === "file") {
       if (isImportableLocalFile(file)) {
-        // This local file is in the exported file tree, so it's a non-InterSystems file that's 
+        // This local file is in the exported file tree, so it's a non-InterSystems file that's
         // part of a CSP application, so import it on save
         return importFileOrFolder(file.uri, true);
       }

src/utils/index.ts

@@ -62,16 +62,16 @@ export interface ConnectionTarget {
  * @param workspace The workspace the file is in.
  */
 function getServerDocName(localPath: string, workspace: string): string {
-  var result = localPath;
+  let result = localPath;
   const workspacePath = workspaceFolderUri(workspace).fsPath;
-  result = result.replace(workspacePath+path.sep,'');
+  result = result.replace(workspacePath + path.sep, "");
   const { folder, addCategory } = config("export", workspace);
-  result = result.replace(folder+path.sep,'');
+  result = result.replace(folder + path.sep, "");
   const cat = addCategory ? getCategory(localPath, addCategory) : null;
   if (cat !== null) {
-    result = result.replace(cat+path.sep,'');
+    result = result.replace(cat + path.sep, "");
   }
-  return result.replace(path.sep,"/");
+  return result.replace(path.sep, "/");
 }
 
 /**
@@ -80,11 +80,11 @@ function getServerDocName(localPath: string, workspace: string): string {
  * @param file The file to check.
  */
 export function isImportableLocalFile(file: vscode.TextDocument): boolean {
-  var result = false;
+  let result = false;
   const workspace = currentWorkspaceFolder(file);
   const workspacePath = workspaceFolderUri(workspace).fsPath;
   const { folder, addCategory } = config("export", workspace);
-  const filePathNoWorkspaceArr = file.fileName.replace(workspacePath+path.sep,'').split(path.sep);
+  const filePathNoWorkspaceArr = file.fileName.replace(workspacePath + path.sep, "").split(path.sep);
   const cat = addCategory ? getCategory(file.fileName, addCategory) : null;
   if (filePathNoWorkspaceArr[0] === folder) {
     if (cat === null || (cat !== null && filePathNoWorkspaceArr[1] === cat)) {
@@ -142,9 +142,8 @@ export function currentFile(document?: vscode.TextDocument): CurrentFile {
     }
   } else {
     if (document.uri.scheme === "file") {
-      name = getServerDocName(fileName,currentWorkspaceFolder(document));
-    }
-    else {
+      name = getServerDocName(fileName, currentWorkspaceFolder(document));
+    } else {
       name = fileName;
     }
     // Need to strip leading / for custom Studio documents which should not be treated as files.