From 5fa1acecee0981d494cea12a4a7e79f95f97cb6d Mon Sep 17 00:00:00 2001 From: geequlim Date: Sun, 26 Feb 2017 20:50:37 +0800 Subject: [PATCH] Parse exported variables with ignore indented vars --- src/gdscript/symbolparser.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gdscript/symbolparser.ts b/src/gdscript/symbolparser.ts index 1a25f5e..96e0319 100644 --- a/src/gdscript/symbolparser.ts +++ b/src/gdscript/symbolparser.ts @@ -139,11 +139,13 @@ class GDScriptSymbolParser { let varreg = /var\s+([_A-Za-z]+[_A-Za-z0-9]*)\s*/; let varreg2 = "var\\s+$X$\\s*"; + let vargroup = 1; if(ignoreIndentedVars) { - varreg = /^var\s+([_A-Za-z]+[_A-Za-z0-9]*)\s*/; - varreg2 = "^var\\s+$X$\\s*"; + varreg = /^((export.*?var)|var)\s+([_A-Za-z]+[_A-Za-z0-9]*)\s?/; + varreg2 = "^((export.*?var)|var)\\s+$X$\\s?"; + vargroup = 3; } - let varnames = getMatches(varreg, 1); + let varnames = getMatches(varreg, vargroup); const vars = findLineRanges(varnames, varreg2); for (let key of Object.keys(vars)){ const r:Range = determRange(key, vars)