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

Refactoring: rename method and hide information about gradle

Browse Source
This commit is contained in:
Nikolay Krasko
2014-10-07 23:49:44 +04:00
parent a7fbc1bc6c
commit 7bf84ec84c
9 changed files with 10 additions and 15 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.isInSourceWithGradleCheck(element)) {
if (!isDebugInfoEnabled() || !ProjectRootsUtil.isInSource(element)) {
return;
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
@Override
public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
if (!(ProjectRootsUtil.isInSourceWithGradleCheck(element) || element.getContainingFile() instanceof JetCodeFragment)) return;
if (!(ProjectRootsUtil.isInSource(element) || element.getContainingFile() instanceof JetCodeFragment)) return;
for (HighlightingVisitor visitor : getBeforeAnalysisVisitors(holder)) {
element.accept(visitor);
idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt
+2 -7
View File
@@ -27,11 +27,6 @@ import kotlin.platform.platformStatic
import org.jetbrains.jet.plugin.util.application.runReadAction
public object ProjectRootsUtil {
platformStatic
private fun isInSource(element: PsiElement): Boolean {
return isInSource(element, true)
}
platformStatic
public fun isInSource(element: PsiElement, includeLibrarySources: Boolean): Boolean {
return runReadAction { (): Boolean ->
@@ -54,7 +49,7 @@ public object ProjectRootsUtil {
}
platformStatic
public fun isInSourceWithGradleCheck(element: PsiElement): Boolean {
return isInSource(element) && !JetModuleTypeManager.getInstance()!!.isKtFileInGradleProjectInWrongFolder(element)
public fun isInSource(element: PsiElement): Boolean {
return isInSource(element, true)
}
}
idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class HierarchyUtils {
PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());
if (file == null) return null;
if (!ProjectRootsUtil.isInSourceWithGradleCheck(file)) return null;
if (!ProjectRootsUtil.isInSource(file)) return null;
return TargetElementUtilBase.findTargetElement(editor, TargetElementUtilBase.getInstance().getAllAccepted());
}
idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class KotlinTypeHierarchyProvider extends JavaTypeHierarchyProvider {
PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());
if (file == null) return null;
if (!ProjectRootsUtil.isInSourceWithGradleCheck(file)) return null;
if (!ProjectRootsUtil.isInSource(file)) return null;
PsiElement target = TargetElementUtilBase.findTargetElement(editor, TargetElementUtilBase.getInstance().getAllAccepted());
idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class KotlinCallHierarchyProvider implements HierarchyProvider {
PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());
if (file == null) return null;
if (!ProjectRootsUtil.isInSourceWithGradleCheck(file)) return null;
if (!ProjectRootsUtil.isInSource(file)) return null;
return TargetElementUtilBase.findTargetElement(editor, TargetElementUtilBase.getInstance().getAllAccepted());
}
idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class DeclarationHintSupport extends AbstractProjectComponent {
Editor editor = e.getEditor();
PsiFile psiFile = PsiDocumentManager.getInstance(myProject).getPsiFile(editor.getDocument());
if (psiFile == null || psiFile.getLanguage() != JetLanguage.INSTANCE || !ProjectRootsUtil.isInSourceWithGradleCheck(psiFile)) {
if (psiFile == null || psiFile.getLanguage() != JetLanguage.INSTANCE || !ProjectRootsUtil.isInSource(psiFile)) {
return;
}
idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+1 -1
View File
@@ -151,7 +151,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
PsiElement first = KotlinPackage.first(elements);
if (DumbService.getInstance(first.getProject()).isDumb() ||
!ProjectRootsUtil.isInSourceWithGradleCheck(elements.get(0))) {
!ProjectRootsUtil.isInSource(elements.get(0))) {
return;
}
idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class KotlinReferencesSearcher extends QueryExecutorBase<PsiReference, Re
PsiElement element = queryParameters.getElementToSearch();
final PsiNamedElement unwrappedElement = AsJavaPackage.getNamedUnwrappedElement(element);
if (unwrappedElement == null || !ProjectRootsUtil.isInSourceWithGradleCheck(unwrappedElement)) return;
if (unwrappedElement == null || !ProjectRootsUtil.isInSource(unwrappedElement)) return;
ApplicationManager.getApplication().runReadAction(
new Runnable() {