Merge pull request #14 from admvx/fixes

Bug fixes

Author: admvx

README.md

@@ -13,6 +13,12 @@ https://github.com/admvx/as2-language-support
 
 ## Release Notes
 
+### 1.2.1
+Addresses the following issues:
+- Superclass members are not resolved when super declaration uses short type
+- Local variables declared after string literals in the same statement are not indexed
+- Npm task `parse-intrinsics` no longer runs successfully
+
 ### 1.2.0
 Add definition support (jump to definition, peek definition)
 

package.json

@@ -6,7 +6,7 @@
     "type": "git",
     "url": "git@github.com:admvx/as2-language-support.git"
   },
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": "Adam Vernon",
   "publisher": "admvx",
   "icon": "icon.png",

server/src/action-context.ts

@@ -121,7 +121,7 @@ export class ActionContext {
 
     let member: ActionParameter;
     if (ambientClass.superClass && chainLength === 1 && symbolChain[0].identifier === 'super') {
-      let superClass = await this.getClassByFullType(ambientClass.superClass, ambientClass.baseUri);
+      let superClass = await this.getClassByFullType(ambientClass.importMap[ambientClass.superClass] || ambientClass.superClass, ambientClass.baseUri);
       member = superClass && superClass.constructorMethod;
     } else {  
       let memberAndClass = await this.traverseSymbolChainToMember(symbolChain, ambientClass, lineIndex);
@@ -411,7 +411,7 @@ export class ActionContext {
     }
 
     if (actionClass.superClass) {
-      let superActionClass = await this.getClassByFullType(actionClass.superClass, actionClass.baseUri);
+      let superActionClass = await this.getClassByFullType(actionClass.importMap[actionClass.superClass] || actionClass.superClass, actionClass.baseUri);
       if (superActionClass) {
         completionItems = completionItems.concat(await this.getInnerSymbols(superActionClass, visibilityFilter, null, false, skipMap, rank));
       }

server/src/action-elements.ts

@@ -112,7 +112,7 @@ export class ActionClass {
     if (lookup[memberName]) {
       return Promise.resolve(lookup[memberName]);
     } else if (this.superClass) {
-      return ActionContext.getClassByFullType(this.superClass, this.baseUri, false)
+      return ActionContext.getClassByFullType(this.importMap[this.superClass] || this.superClass, this.baseUri, false)
         .then(parsedSuperClass => parsedSuperClass && parsedSuperClass.getMemberByName(memberName, filter));
     }
     return null;
@@ -185,7 +185,7 @@ export class ActionClass {
     return description;
   }
 
-  public toIntrinsicPickle(): string {
+  public toPickle(): string {
     this._members.forEach(member => delete member.description);
     return JSON.stringify(<PickledClass>{
       shortType: this.shortType,

server/src/action-parser.ts

@@ -32,11 +32,12 @@ const Patterns = {
   STATIC: /\bstatic\b/,
   METHOD: /(\bfunction\s+)([\w$]+)(\s*\()(.*)\)(?:\s*:\s*([\w$\.]+))?/, //Group 2: method name; group 4 (optional): arg list; group 5 (optional): return type
   IDENTIFIER_AND_TYPE: /(\s*)([\w$]+)(\s*)(?:\:\s*([\w$\.]+)\s*)?/,     //Group 2: var/argument name; group 4 (optional): type
-  LOCAL_VARS: /(\bvar\b)([\s\w$:,=.\[\]()-+*/]+)/,                      //Group 2: content
+  LOCAL_VARS: /(\bvar\b)([\s\w$:,=.\[\]()-+*/"']+)/,                    //Group 2: content
   BRACES: /[{}]/g,
   MATCHED_BRACES: /{(?:(?!{).)*?}/g,
   MATCHED_BRACKETS: /\[(?:(?!\[).)*?\]/g,
-  MATCHED_PARENS: /\((?:(?!\().)*?\)/g
+  MATCHED_PARENS: /\((?:(?!\().)*?\)/g,
+  MATCHED_STRINGS: /(?:".*?"|'.*?')/g
 };
 
 export class ActionParser {
@@ -48,16 +49,17 @@ export class ActionParser {
 
   public instanceTest(): void { }
 
-  public static parseFile(fileUri: string, fileContent: string, deep: boolean = false): ActionClass {
+  public static parseFile(fileUri: string, fileContent: string, deep: boolean = false, isIntrinsic: boolean = false): ActionClass {
     let fullType: string, shortType: string, superClass: string, result: RegExpExecArray, line: string;
 
     fileContent = stripComments(fileContent);
 
     this.wipClass = new ActionClass();
     this.wipClass.fileUri = fileUri;
+    this.wipClass.isIntrinsic = isIntrinsic;
     this.wipClass.lines = fileContent.split(/\r?\n/);
 
-    let includeLocations: boolean = !! fileUri;
+    let includeLocations: boolean = !isIntrinsic && !! fileUri;
     let imports: string[] = [];
 
     let scopeStack: ActionScope[] = [ActionScope.BASE];
@@ -245,6 +247,7 @@ export class ActionParser {
           let localString = recursiveReplaceAndPreserveLength(result[2], Patterns.MATCHED_BRACES);
           localString = recursiveReplaceAndPreserveLength(localString, Patterns.MATCHED_BRACKETS);
           localString = recursiveReplaceAndPreserveLength(localString, Patterns.MATCHED_PARENS);
+          localString = recursiveReplaceAndPreserveLength(localString, Patterns.MATCHED_STRINGS);
           locals = locals.concat(this.getParameterArrayFromString(localString, false, includeLocations, lineNumber + lineCount, result.index + result[1].length));
         }
       }

server/src/file-system-utilities.ts

@@ -4,8 +4,9 @@ import { LogLevel, logIt, ActionConfig } from './config';
 
 export class DirectoryUtility {
 
-  public static fileNamesInDirectory(directoryPath: string, fileNameFilter?: RegExp, includePathInResults: boolean = true): Promise<string[]> {
-    return fse.readdir(URI.parse(directoryPath).fsPath)
+  public static fileNamesInDirectory(directoryPath: string, fileNameFilter?: RegExp, includePathInResults: boolean = true, pathIsUri: boolean = true): Promise<string[]> {
+    directoryPath = pathIsUri ? URI.parse(directoryPath).fsPath : directoryPath;
+    return fse.readdir(directoryPath)
       .then(fileNames => {
         if (fileNameFilter) {
           fileNames = fileNames.filter(fileName => fileName.match(fileNameFilter));
@@ -52,8 +53,8 @@ export class LoadQueue {
   private static _chain: Promise<string> = Promise.resolve('');
   private static _naughtyList: { [path: string]: boolean } = { };
 
-  public static enqueue(pathUri: string): Promise<string> {
-    let filePath = URI.parse(pathUri).fsPath;
+  public static enqueue(filePath: string, pathIsUri: boolean = true): Promise<string> {
+    filePath = pathIsUri ? URI.parse(filePath).fsPath : filePath;
 
     if (this._naughtyList[filePath]) {
       ActionConfig.LOG_LEVEL !== LogLevel.NONE && logIt({ level: LogLevel.WARNING, message: `Already tried to load ${filePath} and failed. Aborting.` });