fixed indention issue in autoformatting, closes #122

Author: daimor

src/providers/DocumentFormattingEditProvider.ts

@@ -32,6 +32,10 @@ export class DocumentFormattingEditProvider implements vscode.DocumentFormatting
       const line = document.lineAt(i);
       const text = this.stripLineComments(line.text);
 
+      if (!text.replace(/[\s\t]+/g, "").length) {
+        continue;
+      }
+
       if (text.match(/<script .*>/)) {
         jsScript = true;
       }
@@ -229,9 +233,8 @@ export class DocumentFormattingEditProvider implements vscode.DocumentFormatting
         const [, found, isFunc] = functionsMatch;
         const pos = functionsMatch.index;
         const range = new vscode.Range(new vscode.Position(i, pos), new vscode.Position(i, pos + found.length));
-        const systemFunction = (isFunc ? systemFunctions : systemVariables).find(el =>
-          el.alias.includes(found.toUpperCase())
-        );
+        const list: any[] = isFunc ? systemFunctions : systemVariables;
+        const systemFunction = list.find(el => el.alias.includes(found.toUpperCase()));
         if (systemFunction) {
           const expect = this._formatter.function(systemFunction.label);
           if (expect !== found) {

src/utils/index.ts

@@ -56,7 +56,11 @@ export function currentFile(document?: vscode.TextDocument): CurrentFile {
     }
   } else {
     const match = content.match(/^ROUTINE ([^\s]+)(?:\s+\[.*Type=([a-z]{3,}))?/i);
-    [, name, ext = "mac"] = match;
+    if (match) {
+      [, name, ext = "mac"] = match;
+    } else {
+      [name, ext = "mac"] = path.basename(document.fileName).split(".");
+    }
   }
   if (!name) {
     return null;
@@ -188,7 +192,7 @@ export function terminalWithDocker() {
       service,
       "/bin/bash",
       "-c",
-      `command -v ccontrol >/dev/null 2>&1 && (ccontrol session $ISC_PACKAGE_INSTANCENAME -U ${ns} || iris session $ISC_PACKAGE_INSTANCENAME -U ${ns})`,
+      `command -v iris >/dev/null 2>&1 && iris session $ISC_PACKAGE_INSTANCENAME -U ${ns} || ccontrol session $ISC_PACKAGE_INSTANCENAME -U ${ns}`,
     ]);
   }
   terminal.show();