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

Refactoring: rename methods

Browse Source
This commit is contained in:
Nikolay Krasko
2014-10-08 18:15:00 +04:00
parent 6c9538b040
commit 3ea2d420b2
15 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class DebugInfoAnnotator implements Annotator {
@Override
public void annotate(@NotNull PsiElement element, @NotNull final AnnotationHolder holder) {
if (!isDebugInfoEnabled() || !ProjectRootsUtil.isInSource(element)) {
if (!isDebugInfoEnabled() || !ProjectRootsUtil.isInProjectOrLibSource(element)) {
return;
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class DuplicateJvmSignatureAnnotator implements Annotator {
@Override
public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
if (!(element instanceof JetFile) && !(element instanceof JetDeclaration)) return;
if (!ProjectRootsUtil.isInSource(element, false)) return;
if (!ProjectRootsUtil.isInProjectSource(element)) return;
PsiFile file = element.getContainingFile();
if (!(file instanceof JetFile) || TargetPlatformDetector.getPlatform((JetFile) file) != TargetPlatform.JVM) return;
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+2 -2
View File
@@ -93,7 +93,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
@Override
public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
if (!(ProjectRootsUtil.isInSource(element) || element.getContainingFile() instanceof JetCodeFragment)) return;
if (!(ProjectRootsUtil.isInProjectOrLibSource(element) || element.getContainingFile() instanceof JetCodeFragment)) return;
for (HighlightingVisitor visitor : getBeforeAnalysisVisitors(holder)) {
element.accept(visitor);
@@ -116,7 +116,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
}
public static void annotateElement(PsiElement element, AnnotationHolder holder, Diagnostics diagnostics) {
if (ProjectRootsUtil.isInSource(element, /* includeLibrarySources = */ false) || element.getContainingFile() instanceof JetCodeFragment) {
if (ProjectRootsUtil.isInProjectSource(element) || element.getContainingFile() instanceof JetCodeFragment) {
ElementAnnotator elementAnnotator = new ElementAnnotator(element, holder);
for (Diagnostic diagnostic : diagnostics.forElement(element)) {
elementAnnotator.registerDiagnosticAnnotations(diagnostic);
idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt
+7 -3
View File
@@ -23,8 +23,7 @@ import org.jetbrains.jet.plugin.util.application.runReadAction
import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope
public object ProjectRootsUtil {
platformStatic
public fun isInSource(element: PsiElement, includeLibrarySources: Boolean): Boolean {
private fun isInSource(element: PsiElement, includeLibrarySources: Boolean): Boolean {
return runReadAction { (): Boolean ->
val containingFile = element.getContainingFile()
if (containingFile == null) return@runReadAction false
@@ -39,7 +38,12 @@ public object ProjectRootsUtil {
}
platformStatic
public fun isInSource(element: PsiElement): Boolean {
public fun isInProjectSource(element: PsiElement): Boolean {
return isInSource(element, false)
}
platformStatic
public fun isInProjectOrLibSource(element: PsiElement): Boolean {
return isInSource(element, true)
}
}