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

Renamed method.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-09-11 21:13:28 +04:00
parent 16334c58aa
commit 58d430bddc
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java
+3 -3
View File
@@ -87,11 +87,11 @@ public class JetPluginUtil {
return libraryScope == ((NamespaceDescriptor) declaration).getMemberScope();
}
public static boolean isInSourceContent(@NotNull PsiElement element) {
return isInSourceContent(element, true);
public static boolean isInSource(@NotNull PsiElement element) {
return isInSource(element, true);
}
public static boolean isInSourceContent(@NotNull PsiElement element, boolean includeLibrarySources) {
public static boolean isInSource(@NotNull PsiElement element, boolean includeLibrarySources) {
PsiFile containingFile = element.getContainingFile();
if (containingFile == null) {
return false;
idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class KotlinTypeHierarchyProvider extends JavaTypeHierarchyProvider {
PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());
if (!(file instanceof JetFile)) return null;
if (!JetPluginUtil.isInSourceContent(file)) return null;
if (!JetPluginUtil.isInSource(file)) return null;
if (JetPluginUtil.isKtFileInGradleProjectInWrongFolder(file)) return null;
PsiElement target = TargetElementUtilBase.findTargetElement(editor, TargetElementUtilBase.getInstance().getAllAccepted());
idea/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() ||
!JetPluginUtil.isInSourceContent(element) ||
!JetPluginUtil.isInSource(element) ||
JetPluginUtil.isKtFileInGradleProjectInWrongFolder(element)) {
return;
}
idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java
+1 -1
View File
@@ -89,7 +89,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 ||
!JetPluginUtil.isInSourceContent(psiFile) ||
!JetPluginUtil.isInSource(psiFile) ||
JetPluginUtil.isKtFileInGradleProjectInWrongFolder(psiFile)) {
return;
}
idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+1 -1
View File
@@ -364,7 +364,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
public void collectSlowLineMarkers(@NotNull List<PsiElement> elements, @NotNull Collection<LineMarkerInfo> result) {
if (elements.isEmpty() ||
DumbService.getInstance(elements.get(0).getProject()).isDumb() ||
!JetPluginUtil.isInSourceContent(elements.get(0)) ||
!JetPluginUtil.isInSource(elements.get(0)) ||
JetPluginUtil.isKtFileInGradleProjectInWrongFolder(elements.get(0))) {
return;
}
idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class JetPsiChecker implements Annotator {
try {
BindingContext bindingContext = AnalyzerFacadeWithCache.analyzeFileWithCache(file).getBindingContext();
if (JetPluginUtil.isInSourceContent(element, /* includeLibrarySources = */ false)) {
if (JetPluginUtil.isInSource(element, /* includeLibrarySources = */ false)) {
Collection<Diagnostic> diagnostics = Sets.newLinkedHashSet(bindingContext.getDiagnostics());
Set<PsiElement> redeclarations = Sets.newHashSet();
for (Diagnostic diagnostic : diagnostics) {
idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class JetJUnitConfigurationProducer extends RuntimeConfigurationProducer
protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context) {
PsiElement leaf = location.getPsiElement();
if (!JetPluginUtil.isInSourceContent(leaf, true)) {
if (!JetPluginUtil.isInSource(leaf, true)) {
return null;
}
idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class JetRunConfigurationProducer extends RuntimeConfigurationProducer im
}
JetFile file = getStartClassFile(location);
if (file == null || !JetPluginUtil.isInSourceContent(file, true)) {
if (file == null || !JetPluginUtil.isInSource(file, true)) {
return null;
}
idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class JetTestNgConfigurationProducer extends TestNGConfigurationProducer
Project project = context.getProject();
PsiElement leaf = location.getPsiElement();
if (!JetPluginUtil.isInSourceContent(leaf, true)) {
if (!JetPluginUtil.isInSource(leaf, true)) {
return false;
}
idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class KotlinReferencesSearcher extends QueryExecutorBase<PsiReference, Re
@Override
public void processQuery(@NotNull ReferencesSearch.SearchParameters queryParameters, @NotNull Processor<PsiReference> consumer) {
PsiElement element = queryParameters.getElementToSearch();
if (!JetPluginUtil.isInSourceContent(element) || JetPluginUtil.isKtFileInGradleProjectInWrongFolder(element)) {
if (!JetPluginUtil.isInSource(element) || JetPluginUtil.isKtFileInGradleProjectInWrongFolder(element)) {
return;
}
if (element instanceof JetClass) {