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

Minor. More convenient function used

Browse Source
This commit is contained in:
Andrey Breslav
2014-04-29 19:42:31 +04:00
parent db00500404
commit 3be8da5607
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java
+1 -4
View File
@@ -25,7 +25,6 @@ import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.UsefulTestCase;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.InTextDirectivesUtils;
import org.jetbrains.jet.analyzer.AnalyzeExhaust;
import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.diagnostics.Severity; import org.jetbrains.jet.lang.diagnostics.Severity;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
@@ -45,9 +44,7 @@ public class DirectiveBasedActionUtils {
return; return;
} }
AnalyzeExhaust exhaust = ResolvePackage.getAnalysisResults(file); Collection<Diagnostic> diagnostics = ResolvePackage.getBindingContext(file).getDiagnostics().all();
Collection<Diagnostic> diagnostics = exhaust.getBindingContext().getDiagnostics().all();
Collection<Diagnostic> errorDiagnostics = Collections2.filter(diagnostics, new Predicate<Diagnostic>() { Collection<Diagnostic> errorDiagnostics = Collections2.filter(diagnostics, new Predicate<Diagnostic>() {
@Override @Override
public boolean apply(@Nullable Diagnostic diagnostic) { public boolean apply(@Nullable Diagnostic diagnostic) {
idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java
+4 -4
View File
@@ -22,7 +22,6 @@ import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.InTextDirectivesUtils;
import org.jetbrains.jet.analyzer.AnalyzeExhaust;
import org.jetbrains.jet.checkers.DebugInfoUtil; import org.jetbrains.jet.checkers.DebugInfoUtil;
import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
@@ -30,6 +29,7 @@ import org.jetbrains.jet.lang.diagnostics.Errors;
import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.psi.JetReferenceExpression;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
@@ -97,8 +97,8 @@ public abstract class AbstractInsertImportOnPasteTest extends JetLightCodeInsigh
} }
private static void checkNoUnresolvedReferences(@NotNull final JetFile file) { private static void checkNoUnresolvedReferences(@NotNull final JetFile file) {
AnalyzeExhaust exhaust = ResolvePackage.getAnalysisResults(file); BindingContext bindingContext = ResolvePackage.getBindingContext(file);
for (Diagnostic diagnostic : exhaust.getBindingContext().getDiagnostics()) { for (Diagnostic diagnostic : bindingContext.getDiagnostics()) {
if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) { if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) {
List<TextRange> textRanges = diagnostic.getTextRanges(); List<TextRange> textRanges = diagnostic.getTextRanges();
String diagnosticText = DefaultErrorMessages.RENDERER.render(diagnostic); String diagnosticText = DefaultErrorMessages.RENDERER.render(diagnostic);
@@ -108,7 +108,7 @@ public abstract class AbstractInsertImportOnPasteTest extends JetLightCodeInsigh
} }
} }
} }
DebugInfoUtil.markDebugAnnotations(file, exhaust.getBindingContext(), new DebugInfoUtil.DebugInfoReporter() { DebugInfoUtil.markDebugAnnotations(file, bindingContext, new DebugInfoUtil.DebugInfoReporter() {
@Override @Override
public void reportElementWithErrorType(@NotNull JetReferenceExpression expression) { public void reportElementWithErrorType(@NotNull JetReferenceExpression expression) {
//do nothing //do nothing