Fixes #71

src/analysis/common.js

@@ -65,7 +65,7 @@ const excludes = [
 ]
 
 let getImportPattern = () => {
-  return /import\s+(public\s+)?(([A-Z]\w*)(\.[A-Z]\w*)*)(\s+as\s+\w+)?\r\n/g
+  return /import\s+(public\s+)?(([A-Z]\w*)(\.[A-Z]\w*)*)(\s+as\s+(\w+))?\r\n/g
 }
 
 let getAllIdents = () => {
@@ -133,6 +133,21 @@ let getImportedModules = (uri) => {
   return importedModules
 }
 
+let getImportedModuleAndAlias = (uri) => {
+  let content = fs.readFileSync(uri).toString()
+  let importPattern = getImportPattern()
+  let match
+  let importedModules = []
+  while (match = importPattern.exec(content)) {
+    let moduleName = match[2].trim()
+    if (match[6] != undefined) {
+      let aliasName = match[6].trim()
+      importedModules.push({ moduleName, aliasName })
+    }
+  }
+  return importedModules
+}
+
 let isDefinitonEqual = (def1, def2) => {
   return def1.path == def2.path
     && def1.module == def2.module
@@ -155,5 +170,6 @@ module.exports = {
   getAllIdents,
   isDefinitonEqual,
   getAllPositions,
-  getImportPattern
+  getImportPattern,
+  getImportedModuleAndAlias
 }

src/analysis/find-definition.js

@@ -92,21 +92,36 @@ let findDefinitionInFile = (definition, uri) => {
   return funcDef || adtTypeFuncDef
 }
 
-let findDefinitionInFiles = (definition, uri) => {
-  locations = []
-  common.getAllFiles('idr').forEach((file) => {
-    let location = findDefinitionInFile(definition, file)
-    if (location) {
-      locations.push(location)
-    }
+let getDefinitionLocations = (identifier) => {
+  return common.getAllFiles('idr').map((file) => {
+    return findDefinitionInFile(identifier, file)
+  }).filter((loc) => {
+    return loc != null && loc != undefined
   })
+}
+
+let findDefinitionInFiles = (identifier, uri) => {
+  let locations = getDefinitionLocations(identifier)
   let importedModules = common.getImportedModules(uri)
   let legalLocations = locations.filter((loc) => {
     return loc.path == uri || importedModules.includes(loc.module)
   })
   return legalLocations[0]
 }
 
+let findDefinitionWithAliasInFiles = (identifier, alias, uri) => {
+  let locations = getDefinitionLocations(identifier)
+  let importedModuleAlias = common.getImportedModuleAndAlias(uri)
+
+  let legalLocations = locations.filter((loc) => {
+    let isImported = importedModuleAlias.filter(({ moduleName, aliasName }) => {
+      return moduleName == loc.module && aliasName == alias
+    }).length == 1
+    return loc.path == uri || isImported
+  })
+  return legalLocations[0]
+}
+
 let findDefinitionForModule = (moduleName) => {
   return common.getAllFiles('idr').map((file) => {
     let content = fs.readFileSync(file).toString()
@@ -127,5 +142,6 @@ let findDefinitionForModule = (moduleName) => {
 
 module.exports = {
   findDefinitionInFiles,
+  findDefinitionWithAliasInFiles,
   findDefinitionForModule
 }

src/providers/definitionProvider.js

@@ -19,6 +19,12 @@ let IdrisDefinitionProvider = (function () {
       if (match && match[2].includes(currentWord)) {
         let loc = findDefinition.findDefinitionForModule(match[2])
         resolve(loc)
+      } else if(/(\w+)\.(\w+)/i.test(currentWord)) {
+        let match = /(\w+)\.(\w+)/i.exec(currentWord)
+        let moduleAliasName = match[1].trim()
+        let identifier = match[2].trim()
+        let loc = findDefinition.findDefinitionWithAliasInFiles(identifier, moduleAliasName, uri)
+        resolve(loc)
       } else {
         let loc = findDefinition.findDefinitionInFiles(currentWord, uri)
         resolve(loc)