fixed diagnostic error, for values in quotes, fixes #64

Author: daimor

src/providers/ObjectScriptDiagnosticProvider.ts

@@ -85,9 +85,15 @@ export class ObjectScriptDiagnosticProvider {
     text = text.replace(/\/\/.*$/, "");
     text = text.replace(/#+;.*$/, "");
     text = text.replace(/;.*$/, "");
+    text = text.replace(/\/\*.*(?=\*\/)\*\//g, e => e.replace(/./g, " "));
     return text;
   }
 
+  /// replace value in double quotes by spaces
+  private stripQuoted(text: string) {
+    return text.replace(/"(?:.*(?="")"")*[^"]*"/g, e => '"' + e.replace(/./g, " ").slice(2) + '"');
+  }
+
   private commands(document: vscode.TextDocument): vscode.Diagnostic[] {
     const result = new Array<vscode.Diagnostic>();
     const isClass = document.fileName.toLowerCase().endsWith(".cls");
@@ -102,7 +108,9 @@ export class ObjectScriptDiagnosticProvider {
     let sqlParens = 0;
     for (let i = 0; i < document.lineCount; i++) {
       const line = document.lineAt(i);
-      const text = this.stripLineComments(line.text);
+      let text = line.text;
+      text = this.stripLineComments(text);
+      text = this.stripQuoted(text);
 
       // it is important to check script tag context before ObjectScript comments
       // since /* ... */ comments can also be used in JavaScript
@@ -205,7 +213,9 @@ export class ObjectScriptDiagnosticProvider {
     let isCode = !isClass;
     for (let i = 0; i < document.lineCount; i++) {
       const line = document.lineAt(i);
-      const text = this.stripLineComments(line.text);
+      let text = line.text;
+      text = this.stripLineComments(text);
+      text = this.stripQuoted(text);
 
       if (text.match(/\/\*/)) {
         inComment = true;
@@ -230,7 +240,7 @@ export class ObjectScriptDiagnosticProvider {
         continue;
       }
 
-      const pattern = /(?<!\$)(\$\b[a-z]+)\b/gi;
+      const pattern = /(?<!\$)(\$[a-z]+)/gi;
       let functionsMatch = null;
       while ((functionsMatch = pattern.exec(text)) !== null) {
         const [, found] = functionsMatch;

src/utils/index.ts

@@ -139,7 +139,19 @@ export function portFromDockerCompose(): { port: number; docker: boolean } {
   if (!internalPort || !file || !service || service === "") {
     return result;
   }
-  const cwd = workspaceFolderUri().fsPath;
+  const workspaceFolderPath = workspaceFolderUri().fsPath;
+  const workspaceRootPath = vscode.workspace.workspaceFolders[0].uri.fsPath;
+
+  const cwd = fs.existsSync(path.join(workspaceFolderPath, file))
+    ? workspaceFolderPath
+    : fs.existsSync(path.join(workspaceRootPath, file))
+    ? workspaceRootPath
+    : null;
+
+  if (!cwd) {
+    return result;
+  }
+
   const cmd = `docker-compose -f ${file} port --protocol=tcp ${service} ${internalPort}`;
   try {
     const serviceLine = execSync(cmd, {
@@ -169,15 +181,18 @@ export function terminalWithDocker() {
   const terminalName = `ObjectScript:${workspace}`;
   let terminal = vscode.window.terminals.find(el => el.name === terminalName);
   if (!terminal) {
+    outputChannel.appendLine("Open terminal");
     terminal = vscode.window.createTerminal(terminalName, "docker-compose", [
       "-f",
       file,
       "exec",
       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 ccontrol >/dev/null 2>&1 && (ccontrol session $ISC_PACKAGE_INSTANCENAME -U ${ns} || iris session $ISC_PACKAGE_INSTANCENAME -U ${ns})`,
     ]);
+  } else {
+    outputChannel.appendLine("terminal already exists");
   }
   terminal.show();
   return terminal;