浏览代码

improved variable parsing
improved unused variable checking fix #10

geequlim 8 年之前
父节点
当前提交
236adcab1c
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      src/gdscript/diagnostic.ts
  2. 1 1
      src/gdscript/symbolparser.ts

+ 2 - 2
src/gdscript/diagnostic.ts

@@ -60,9 +60,9 @@ class GDScriptDiagnosticSeverity {
     const text = doc.getText();
     
     const check = (name:string, range: vscode.Range) => {
-      var matchs = text.match(new RegExp(`[^\w]\\s*${name}[^\w]\\s*`, 'g'));
+      var matchs = text.match(new RegExp(`[^\\w]\\s*${name}[^\\w]\\s*`, 'g'));
       let count = matchs?matchs.length:0;
-      var incomment = text.match(new RegExp(`#.*?[^\w]*${name}[^\w]`, 'g'));
+      var incomment = text.match(new RegExp(`#.*?[^\\w]*${name}[^\\w]`, 'g'));
       count -= incomment?incomment.length:0;
       if(count <= 1)
         diagnostics.push(new vscode.Diagnostic(range, `${name} is never used.`, DiagnosticSeverity.Warning));

+ 1 - 1
src/gdscript/symbolparser.ts

@@ -138,7 +138,7 @@ class GDScriptSymbolParser {
     }
 
     let varreg = /var\s+([_A-Za-z]+[_A-Za-z0-9]*)\s*/;
-    let varreg2 = "var\\s+$X$\\s*";
+    let varreg2 = "var\\s+$X$([^\\w]|$)";
     let vargroup = 1;
     if(ignoreIndentedVars) {
       varreg = /^((export.*?var)|var)\s+([_A-Za-z]+[_A-Za-z0-9]*)\s?/;