Resolving calls more precisely

DanielSchiavini · Jul 5, 2024 · 19b3a1e · 19b3a1e
1 parent 2f2ef7f
commit 19b3a1e
Show file tree

Hide file tree

Showing 46 changed files with 221 additions and 453 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1 @@
-src/main/java/org/vyperlang/plugin/grammar/**/*.java linguist-generated=true
-src/main/java/org/vyperlang/plugin/parser/**/*.java linguist-generated=true
-src/main/java/org/vyperlang/plugin/psi/**/*.java linguist-generated=true
+src/gen/**/*.* linguist-generated=true
diff --git a/.idea/modules/vyper-plugin.main.iml b/.idea/modules/vyper-plugin.main.iml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ## [Unreleased]
 - Fix auto-complete issues and `immutable` support ([#31](https://github.com/NikitaMishin/vyper-plugin/issues/31))
+- Fix find usages issues ([#28](https://github.com/NikitaMishin/vyper-plugin/issues/28)) for `immutable`, `interface` and `struct`
 
 ## [0.2.0-alpha.3] - 2024-07-02
 - Add automatic compilation errors ([#36](https://github.com/NikitaMishin/vyper-plugin/issues/36))

diff --git a/src/main/gen/org/vyperlang/plugin/parser/BaseVyperParser.java b/src/main/gen/org/vyperlang/plugin/parser/BaseVyperParser.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/VyperEventDeclaration.java b/src/main/gen/org/vyperlang/plugin/psi/VyperEventDeclaration.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/VyperEventLogExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperEventLogExpression.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/VyperImplementsDirective.java b/src/main/gen/org/vyperlang/plugin/psi/VyperImplementsDirective.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/VyperImportDirective.java b/src/main/gen/org/vyperlang/plugin/psi/VyperImportDirective.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/VyperStructExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperStructExpression.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/VyperTypes.java b/src/main/gen/org/vyperlang/plugin/psi/VyperTypes.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/VyperVisitor.java b/src/main/gen/org/vyperlang/plugin/psi/VyperVisitor.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/impl/VyperEventDeclarationImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperEventDeclarationImpl.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/impl/VyperEventLogExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperEventLogExpressionImpl.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/impl/VyperImplementsDirectiveImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperImplementsDirectiveImpl.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/impl/VyperImportDirectiveImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperImportDirectiveImpl.java
diff --git a/src/main/gen/org/vyperlang/plugin/psi/impl/VyperStructExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperStructExpressionImpl.java
diff --git a/src/main/kotlin/org/vyperlang/plugin/VyperLanguage.kt b/src/main/kotlin/org/vyperlang/plugin/VyperLanguage.kt
@@ -3,8 +3,5 @@ package org.vyperlang.plugin
 import com.intellij.lang.Language
 
 object VyperLanguage : Language("Vyper", "text/vyper") {
-
     override fun isCaseSensitive() = true
 }
-
-
diff --git a/src/main/kotlin/org/vyperlang/plugin/VyperParserDefinition.kt b/src/main/kotlin/org/vyperlang/plugin/VyperParserDefinition.kt
@@ -1,6 +1,5 @@
 package org.vyperlang.plugin
 
-
 import com.intellij.lang.ASTNode
 import com.intellij.lang.ParserDefinition
 import com.intellij.lang.PsiParser

diff --git a/src/main/kotlin/org/vyperlang/plugin/VyperStubGenerator.kt b/src/main/kotlin/org/vyperlang/plugin/VyperStubGenerator.kt
@@ -13,7 +13,6 @@ import com.intellij.openapi.vfs.VirtualFileManager
 import org.vyperlang.plugin.settings.VyperSettings
 import java.io.File
 
-
 object VyperStubGenerator {
 
     fun createStubInGenSourceFolder(
@@ -51,7 +50,6 @@ object VyperStubGenerator {
         ModuleRootManager.getInstance(module).sourceRoots
             .firstOrNull { it.name == VyperSettings.INSTANCE.genarateOutputPath }
 
-
     private fun generateFolder(module: Module, project: Project) {
         WriteCommandAction.runWriteCommandAction(project) {
 

diff --git a/src/main/kotlin/org/vyperlang/plugin/actions/CompileVyperFileAction.kt b/src/main/kotlin/org/vyperlang/plugin/actions/CompileVyperFileAction.kt
@@ -15,7 +15,6 @@ import org.vyperlang.plugin.compile.VyperParameters
 import org.vyperlang.plugin.gui.NoFilesWithVyperAreSelectedDialogue
 import org.vyperlang.plugin.settings.VyperSettings
 
-
 private const val COMPILING_MESSAGE = "Compiling Vyper"
 private val EXTENSION = VyperFileType.INSTANCE.defaultExtension
 

diff --git a/src/main/kotlin/org/vyperlang/plugin/actions/CreateVyperFileAction.kt b/src/main/kotlin/org/vyperlang/plugin/actions/CreateVyperFileAction.kt
@@ -1,6 +1,5 @@
 package org.vyperlang.plugin.actions
 
-
 import com.intellij.ide.actions.CreateFileFromTemplateAction
 import com.intellij.ide.actions.CreateFileFromTemplateDialog
 import com.intellij.openapi.project.Project

diff --git a/src/main/kotlin/org/vyperlang/plugin/annotators/ColorAnnotator.kt b/src/main/kotlin/org/vyperlang/plugin/annotators/ColorAnnotator.kt
@@ -8,7 +8,6 @@ import org.vyperlang.plugin.VyperFileType
 import org.vyperlang.plugin.VyperInterfaceFileType
 import org.vyperlang.plugin.psi.*
 
-
 /**
  * Annotator that highlights Vyper elements with different colors
  */

diff --git a/src/main/kotlin/org/vyperlang/plugin/annotators/VyperDeclarationsOrderAnnotator.kt b/src/main/kotlin/org/vyperlang/plugin/annotators/VyperDeclarationsOrderAnnotator.kt
@@ -17,7 +17,7 @@ class VyperDeclarationsOrderAnnotator : Annotator {
     override fun annotate(element: PsiElement, holder: AnnotationHolder) {
 
         if (element is VyperStateVariableDeclaration) {
-            val declarations = (element.file as VyperFile).statements.takeWhile { it != element }
+            val declarations = (element.file as VyperFile).elements.takeWhile { it != element }
             loop@ for (dec in declarations) {
                 when (dec) {
 

diff --git a/src/main/kotlin/org/vyperlang/plugin/compile/VyperCompiler.kt b/src/main/kotlin/org/vyperlang/plugin/compile/VyperCompiler.kt
@@ -15,7 +15,6 @@ import org.vyperlang.plugin.docker.ToolResult
 import org.vyperlang.plugin.docker.VyperCompilerDocker
 import org.vyperlang.plugin.toolWindow.VyperWindow
 
-
 data class VyperParameters(
     val module: Module,
     val project: Project,
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ import org.vyperlang.plugin.VyperFileType @@
     import org.vyperlang.plugin.VyperInterfaceFileType
     import org.vyperlang.plugin.psi.*
     /**
      * Annotator that highlights Vyper elements with different colors
      */
@@ Expand Down @@