Changed LookupUtil to use stub indexes instead of iterating over global labels and symbol definitions. Added basic test for Structure View.

src/main/java/de/platon42/intellij/plugins/m68k/psi/M68kLookupUtil.kt

@@ -1,28 +1,41 @@
 package de.platon42.intellij.plugins.m68k.psi
 
 import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiManager
-import com.intellij.psi.search.FileTypeIndex
 import com.intellij.psi.search.GlobalSearchScope
+import com.intellij.psi.stubs.StubIndex
 import com.intellij.psi.util.PsiTreeUtil
-import de.platon42.intellij.plugins.m68k.M68kFileType
+import de.platon42.intellij.plugins.m68k.stubs.M68kGlobalLabelStubIndex
+import de.platon42.intellij.plugins.m68k.stubs.M68kSymbolDefinitionStubIndex
 
 object M68kLookupUtil {
 
     fun findAllGlobalLabels(project: Project): List<M68kGlobalLabel> {
-        return getFiles(project)
-            .flatMap(::findAllGlobalLabels)
-            .toList()
+        val results: MutableList<M68kGlobalLabel> = ArrayList()
+        StubIndex.getInstance().processAllKeys(M68kGlobalLabelStubIndex.KEY, project)
+        {
+            results.addAll(StubIndex.getElements(M68kGlobalLabelStubIndex.KEY, it, project, GlobalSearchScope.allScope(project), M68kGlobalLabel::class.java))
+            true
+        }
+        return results
     }
 
     fun findAllGlobalLabels(file: M68kFile): List<M68kGlobalLabel> {
         val results: MutableList<M68kGlobalLabel> = ArrayList()
-        var currentStatement = file.firstChild
-        while (currentStatement != null) {
-            val child = currentStatement.firstChild
-            if (child is M68kGlobalLabel) results.add(child)
-            currentStatement = PsiTreeUtil.getNextSiblingOfType(currentStatement, M68kStatement::class.java)
-        }
+        StubIndex.getInstance().processAllKeys(
+            M68kGlobalLabelStubIndex.KEY,
+            {
+                results.addAll(
+                    StubIndex.getElements(
+                        M68kGlobalLabelStubIndex.KEY,
+                        it,
+                        file.project,
+                        GlobalSearchScope.fileScope(file),
+                        M68kGlobalLabel::class.java
+                    )
+                )
+                true
+            }, GlobalSearchScope.fileScope(file), null
+        )
         return results
     }
 
@@ -40,23 +53,40 @@ object M68kLookupUtil {
     }
 
     fun findAllSymbolDefinitions(project: Project): List<M68kSymbolDefinition> {
-        return getFiles(project)
-            .flatMap(::findAllSymbolDefinitions)
-            .toList()
-    }
-
-    fun findAllSymbolDefinitions(file: M68kFile): List<M68kSymbolDefinition> {
         val results: MutableList<M68kSymbolDefinition> = ArrayList()
-        var currentStatement = file.firstChild
-        while (currentStatement != null) {
-            val child = currentStatement.firstChild
-            if (child is M68kAssignment) results.add(child.firstChild as M68kSymbolDefinition)
-            currentStatement = PsiTreeUtil.getNextSiblingOfType(currentStatement, M68kStatement::class.java)
+        StubIndex.getInstance().processAllKeys(M68kSymbolDefinitionStubIndex.KEY, project)
+        {
+            results.addAll(
+                StubIndex.getElements(
+                    M68kSymbolDefinitionStubIndex.KEY,
+                    it,
+                    project,
+                    GlobalSearchScope.allScope(project),
+                    M68kSymbolDefinition::class.java
+                )
+            )
+            true
         }
         return results
     }
 
-    private fun getFiles(project: Project) =
-        FileTypeIndex.getFiles(M68kFileType.INSTANCE, GlobalSearchScope.allScope(project)).asSequence()
-            .map { PsiManager.getInstance(project).findFile(it) as M68kFile }
+    fun findAllSymbolDefinitions(file: M68kFile): List<M68kSymbolDefinition> {
+        val results: MutableList<M68kSymbolDefinition> = ArrayList()
+        StubIndex.getInstance().processAllKeys(
+            M68kSymbolDefinitionStubIndex.KEY,
+            {
+                results.addAll(
+                    StubIndex.getElements(
+                        M68kSymbolDefinitionStubIndex.KEY,
+                        it,
+                        file.project,
+                        GlobalSearchScope.fileScope(file),
+                        M68kSymbolDefinition::class.java
+                    )
+                )
+                true
+            }, GlobalSearchScope.fileScope(file), null
+        )
+        return results
+    }
 }

src/main/java/de/platon42/intellij/plugins/m68k/structureview/M68kStructureViewElement.kt

@@ -4,6 +4,7 @@ import com.intellij.ide.structureView.StructureViewTreeElement
 import com.intellij.ide.util.treeView.smartTree.TreeElement
 import com.intellij.navigation.ItemPresentation
 import com.intellij.psi.NavigatablePsiElement
+import com.intellij.refactoring.suggested.startOffset
 import de.platon42.intellij.plugins.m68k.psi.M68kFile
 import de.platon42.intellij.plugins.m68k.psi.M68kGlobalLabel
 import de.platon42.intellij.plugins.m68k.psi.M68kLookupUtil
@@ -18,8 +19,10 @@ class M68kStructureViewElement(private val myElement: NavigatablePsiElement) : S
         return when (myElement) {
             is M68kFile -> {
                 listOf(
-                    M68kLookupUtil.findAllSymbolDefinitions(myElement),
-                    M68kLookupUtil.findAllGlobalLabels(myElement)
+                    M68kLookupUtil.findAllSymbolDefinitions(myElement).sortedBy { it.startOffset },
+                    M68kLookupUtil.findAllGlobalLabels(myElement).sortedBy { it.startOffset },
+//                    M68kLookupUtil.findAllSymbolDefinitions(myElement).sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.name!! }),
+//                    M68kLookupUtil.findAllGlobalLabels(myElement).sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.name!! })
                 )
                     .flatten()
                     .map(::M68kStructureViewElement)