azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug when notification doesn't disappear after setting module as java

Browse Source 
Stop caching value on ProjectRootModificationTracker because marker classes will be visible only after indexing is finished
This commit is contained in:
Nikolay Krasko
2013-03-20 16:11:20 +04:00
parent 0590408236
commit 09c58287a8
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/framework/KotlinFrameworkDetector.java
+3 -18
View File
@@ -49,7 +49,6 @@ import java.util.Set;
public class KotlinFrameworkDetector { public class KotlinFrameworkDetector {
private static final Key<CachedValue<Boolean>> IS_KOTLIN_JS_MODULE = Key.create("IS_KOTLIN_JS_MODULE"); private static final Key<CachedValue<Boolean>> IS_KOTLIN_JS_MODULE = Key.create("IS_KOTLIN_JS_MODULE");
private static final Key<CachedValue<Boolean>> IS_KOTLIN_JAVA_MODULE = Key.create("IS_KOTLIN_JAVA_MODULE");
private KotlinFrameworkDetector() { private KotlinFrameworkDetector() {
} }
@@ -59,23 +58,9 @@ public class KotlinFrameworkDetector {
return module != null && isJsKotlinModule(module); return module != null && isJsKotlinModule(module);
} }
public static boolean isJavaKotlinModule(@NotNull final Module module) { public static boolean isJavaKotlinModule(@NotNull Module module) {
CachedValue<Boolean> result = module.getUserData(IS_KOTLIN_JAVA_MODULE); GlobalSearchScope scope = module.getModuleWithDependenciesAndLibrariesScope(false);
if (result == null) { return KotlinRuntimeLibraryUtil.getKotlinRuntimeMarkerClass(scope) != null;
result = CachedValuesManager.getManager(module.getProject()).createCachedValue(new CachedValueProvider<Boolean>() {
@Override
public Result<Boolean> compute() {
GlobalSearchScope scope = module.getModuleWithDependenciesAndLibrariesScope(false);
boolean javaMarkerClassFound = KotlinRuntimeLibraryUtil.getKotlinRuntimeMarkerClass(scope) != null;
return Result.create(javaMarkerClassFound, ProjectRootModificationTracker.getInstance(module.getProject()));
}
}, false);
module.putUserData(IS_KOTLIN_JAVA_MODULE, result);
}
return result.getValue();
} }
public static boolean isJsKotlinModule(@NotNull final Module module) { public static boolean isJsKotlinModule(@NotNull final Module module) {