predefined std

Author: tangzx

src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt

@@ -19,7 +19,6 @@ package com.tang.intellij.lua.annotator
 import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.lang.annotation.Annotator
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors
-import com.intellij.openapi.roots.FileIndexFacade
 import com.intellij.openapi.util.Key
 import com.intellij.psi.PsiElement
 import com.intellij.psi.search.searches.ReferencesSearch
@@ -125,7 +124,7 @@ class LuaAnnotator : Annotator {
             val res = LuaPsiResolveUtil.resolve(o, SearchContext(o.project))
             if (res != null) { //std api highlighting
                 val containingFile = res.containingFile
-                if (FileIndexFacade.getInstance(o.project).isInLibraryClasses(containingFile.virtualFile)) {
+                if (LuaFileUtil.isStdLibFile(containingFile.virtualFile, o.project)) {
                     val annotation = myHolder!!.createInfoAnnotation(o, null)
                     annotation.textAttributes = LuaHighlightingData.STD_API
                     o.putUserData(STD_MARKER, true)

src/main/java/com/tang/intellij/lua/project/LuaPredefinedLibraryProvider.kt

@@ -16,7 +16,6 @@
 
 package com.tang.intellij.lua.project
 
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.util.indexing.IndexableSetContributor
@@ -37,11 +36,18 @@ class LuaPredefinedLibraryProvider : IndexableSetContributor() {
         return list
     }*/
 
-    override fun getAdditionalRootsToIndex(): Set<VirtualFile> {
+    val predefined: Set<VirtualFile> by lazy {
         val dir = LuaFileUtil.getPluginVirtualFile("std")
         val file = VfsUtil.findFileByIoFile(File(dir), false)
         val set = mutableSetOf<VirtualFile>()
-        set.add(file!!)
-        return set
+        if (file != null) {
+            file.children.forEach { it.putUserData(LuaFileUtil.PREDEFINED_KEY, true) }
+            set.add(file)
+        }
+        set
+    }
+
+    override fun getAdditionalRootsToIndex(): Set<VirtualFile> {
+        return predefined
     }
 }

src/main/java/com/tang/intellij/lua/project/StdSDK.java

@@ -22,9 +22,6 @@
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkModificator;
 import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl;
-import com.intellij.openapi.roots.OrderRootType;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.tang.intellij.lua.psi.LuaFileUtil;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -37,10 +34,16 @@ public class StdSDK implements ApplicationComponent {
     @Override
     public void initComponent() {
         ProjectJdkTable pjt = ProjectJdkTable.getInstance();
+        //清除旧的std sdk，不用了，用predefined代替
         Sdk mySdk = pjt.findJdk(StdSDK.NAME);
+        if (mySdk != null) {
+            SdkModificator sdkModificator = mySdk.getSdkModificator();
+            sdkModificator.removeAllRoots();
+            sdkModificator.commitChanges();
+        }
         if (mySdk == null) {
             ProjectJdkImpl sdk = new ProjectJdkImpl(StdSDK.NAME, LuaSdkType.getInstance());
-            SdkModificator sdkModificator = sdk.getSdkModificator();
+            /*SdkModificator sdkModificator = sdk.getSdkModificator();
 
             VirtualFile dir  = LuaFileUtil.getPluginVirtualDirectory();
             if (dir != null) {
@@ -56,9 +59,9 @@ public void initComponent() {
                 }
             }
 
-            sdkModificator.commitChanges();
+            sdkModificator.commitChanges();*/
 
-            ApplicationManager.getApplication().runWriteAction(() -> ProjectJdkTable.getInstance().addJdk(sdk));
+            ApplicationManager.getApplication().runWriteAction(() -> pjt.addJdk(sdk));
         }
     }
 

src/main/java/com/tang/intellij/lua/psi/LuaFileUtil.java

@@ -22,7 +22,9 @@
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.FileIndexFacade;
 import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
@@ -160,4 +162,10 @@ public static String getPluginVirtualFile(String path) {
         }
         return null;
     }
+
+    public static Key<Boolean> PREDEFINED_KEY = Key.create("lua.lib.predefined");
+
+    public static boolean isStdLibFile(@NotNull VirtualFile file, Project project) {
+        return file.getUserData(PREDEFINED_KEY) != null || FileIndexFacade.getInstance(project).isInLibraryClasses(file);
+    }
 }