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

getDiagnostics() in BindingContext returns Diagnostics rather than List<Diagnostic>

Browse Source
This commit is contained in:
Andrey Breslav
2013-09-17 18:49:18 +04:00
parent b98d05bd73
commit 887e4276ee
15 changed files with 108 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class IdeRenderers {
private Set<ValueParameterDescriptor> getParametersToHighlight(ResolvedCall<? extends CallableDescriptor> call) {
Set<ValueParameterDescriptor> parameters = new HashSet<ValueParameterDescriptor>();
if (call instanceof ResolvedCallImpl) {
Collection<Diagnostic> diagnostics = ((ResolvedCallImpl)call).getTrace().getBindingContext().getDiagnostics();
Iterable<Diagnostic> diagnostics = ((ResolvedCallImpl)call).getTrace().getBindingContext().getDiagnostics();
for (Diagnostic diagnostic : diagnostics) {
if (diagnostic.getFactory() == Errors.TOO_MANY_ARGUMENTS) {
parameters.add(null);
idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class MapPlatformClassToKotlinFix extends JetIntentionAction<JetReference
@Override
public void invoke(@NotNull Project project, Editor editor, JetFile file) throws IncorrectOperationException {
BindingContext context = KotlinCacheManagerUtil.getDeclarationsBindingContext(file);
Collection<Diagnostic> diagnostics = context.getDiagnostics();
Iterable<Diagnostic> diagnostics = context.getDiagnostics();
List<JetImportDirective> imports = new ArrayList<JetImportDirective>();
List<JetUserType> usages = new ArrayList<JetUserType>();
idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTest.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class DiagnosticMessageTest extends JetLiteFixture {
BindingContext bindingContext = analyzeExhaust.getBindingContext();
final Set<AbstractDiagnosticFactory> factoriesSet = Sets.newHashSet(diagnosticFactories);
List<Diagnostic> diagnostics = ContainerUtil.filter(bindingContext.getDiagnostics(), new Condition<Diagnostic>() {
List<Diagnostic> diagnostics = ContainerUtil.filter(bindingContext.getDiagnostics().all(), new Condition<Diagnostic>() {
@Override
public boolean value(Diagnostic diagnostic) {
return factoriesSet.contains(diagnostic.getFactory());
idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt
+1 -1
View File
@@ -47,7 +47,7 @@ public class NoErrorsInStdlibTest: LightCodeInsightFixtureTestCase() {
val psiFile = psiManager.findFile(file)
if (psiFile is JetFile) {
var bindingContext = AnalyzerFacadeWithCache.analyzeFileWithCache(psiFile).getBindingContext()
val errors = bindingContext.getDiagnostics().filter { it.getSeverity() == Severity.ERROR }
val errors = bindingContext.getDiagnostics().all().filter { it.getSeverity() == Severity.ERROR }
if (!errors.isEmpty()) {
System.err.println("${psiFile.getName()}: ${errors.size()} errors")
idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixActionsUtils.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class QuickFixActionsUtils {
AnalyzeExhaust exhaust = AnalyzerFacadeWithCache.analyzeFileWithCache(file);
Collection<Diagnostic> diagnostics = exhaust.getBindingContext().getDiagnostics();
Collection<Diagnostic> diagnostics = exhaust.getBindingContext().getDiagnostics().all();
Collection<Diagnostic> errorDiagnostics = Collections2.filter(diagnostics, new Predicate<Diagnostic>() {
@Override
public boolean apply(@Nullable Diagnostic diagnostic) {