some small fixes

Author: daimor

extension.ts

@@ -112,6 +112,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     }
   });
 
+  const wordPattern = /(\"(?:[^\"]|\"\")*\")|((\${1,3}|[irm]?%|\^|#)?[^`~!\@@#\%\^\&*()-\=+[{\]\}\|\;\:\'\"\,.\<>\/\?_\s]+)/;
+
   context.subscriptions.push(
     window.onDidChangeActiveTextEditor(e => {
       if (workspace.workspaceFolders && workspace.workspaceFolders.length > 1) {
@@ -160,6 +162,15 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 
     vscode.workspace.registerTextDocumentContentProvider(OBJECTSCRIPT_FILE_SCHEMA, documentContentProvider),
     vscode.workspace.registerTextDocumentContentProvider(OBJECTSCRIPTXML_FILE_SCHEMA, xmlContentProvider),
+    vscode.languages.setLanguageConfiguration('objectscript-class', {
+      wordPattern
+    }),
+    vscode.languages.setLanguageConfiguration('objectscript', {
+      wordPattern
+    }),
+    vscode.languages.setLanguageConfiguration('objectscript-macros', {
+      wordPattern
+    }),
     vscode.languages.registerDocumentSymbolProvider(['objectscript-class'], new ObjectScriptClassSymbolProvider()),
     vscode.languages.registerDocumentSymbolProvider(['objectscript'], new ObjectScriptRoutineSymbolProvider()),
     vscode.languages.registerFoldingRangeProvider(['objectscript-class'], new ObjectScriptClassFoldingRangeProvider()),

language-configuration-class.jsonc

@@ -17,6 +17,5 @@
       "start": "^((Class|Client)?Method|Query|XData|Storage|Trigger)",
       "end": "^}"
     }
-  },
-  "wordPattern": "(\"(?:[^\"]|\"\")*\")|((\\${1,3}|[irm]?%|\\^|#)?\\b\\w+[\\d\\w]*\\b)"
+  }
 }

language-configuration.json

@@ -12,6 +12,5 @@
   "indentationRules": {
     "increaseIndentPattern": "{",
     "decreaseIndentPattern": "}"
-  },
-  "wordPattern": "(\"(?:[^\"]|\"\")*\")|((\\${1,3}|[irm]?%|\\^|#)?\\b\\w+[\\d\\w]*\\b)"
+  }
 }

providers/ObjectScriptDefinitionProvider.ts

@@ -12,14 +12,16 @@ export class ObjectScriptDefinitionProvider implements vscode.DefinitionProvider
   ): vscode.ProviderResult<vscode.Location | vscode.Location[] | vscode.DefinitionLink[]> {
     let lineText = document.lineAt(position.line).text;
 
-    let macroRange = document.getWordRangeAtPosition(position, /\${3}\b\w+\b/);
+    let macroRange = document.getWordRangeAtPosition(position);
     let macroText = macroRange ? document.getText(macroRange) : '';
     let macroMatch = macroText.match(/^\${3}(\b\w+\b)$/);
     if (macroMatch) {
       let fileName = currentFile().name;
       let [, macro] = macroMatch;
-      return this.macro(fileName, macro).then(
-        data => new vscode.Location(DocumentContentProvider.getUri(data.document), new vscode.Position(data.line, 0))
+      return this.macro(fileName, macro).then(data =>
+        data && data.document.length
+          ? new vscode.Location(DocumentContentProvider.getUri(data.document), new vscode.Position(data.line, 0))
+          : null
       );
     }
     let asClass = /(\b(?:Of|As|Extends)\b %?\b[a-zA-Z][a-zA-Z0-9]+(?:\.[a-zA-Z][a-zA-Z0-9]+)*\b(?! of))/i;

providers/ObjectScriptHoverProvider.ts

@@ -53,9 +53,11 @@ export class ObjectScriptHoverProvider implements vscode.HoverProvider {
   async macro(fileName: string, macro: string): Promise<string[]> {
     const api = new AtelierAPI();
     let includes = [];
-    if (fileName.toLowerCase().endsWith('cls')) {
+    if (fileName.toLowerCase().endsWith('.cls')) {
       let classDefinition = new ClassDefinition(fileName);
       includes = await classDefinition.includeCode();
+    } else if (fileName.toLowerCase().endsWith('.inc')) {
+      includes.push(fileName.replace(/\.inc$/i, ''));
     }
     return api
       .getmacrodefinition(fileName, macro, includes)