From b98f000c29a14283aae63365c59588cd73b82bb9 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 8 Oct 2014 21:25:12 +0400 Subject: [PATCH] Prevent external change in SimpleDiagnostics and convert to Kotlin --- .../jet/lang/resolve/SimpleDiagnostics.java | 62 ------------------- .../jet/lang/resolve/SimpleDiagnostics.kt | 37 +++++++++++ 2 files changed, 37 insertions(+), 62 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.java create mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.kt diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.java deleted file mode 100644 index 02731290a54..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.resolve; - -import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; - -import java.util.Collection; -import java.util.Iterator; - -public class SimpleDiagnostics implements Diagnostics { - private final Collection diagnostics; - private final DiagnosticsElementsCache elementsCache = new DiagnosticsElementsCache(this); - - public SimpleDiagnostics(@NotNull Collection diagnostics) { - this.diagnostics = diagnostics; - } - - @NotNull - @Override - public Collection all() { - return diagnostics; - } - - @NotNull - @Override - public Collection forElement(@NotNull PsiElement psiElement) { - return elementsCache.getDiagnostics(psiElement); - } - - @NotNull - @Override - public Diagnostics noSuppression() { - return this; - } - - @NotNull - @Override - public Iterator iterator() { - return all().iterator(); - } - - @Override - public boolean isEmpty() { - return all().isEmpty(); - } -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.kt new file mode 100644 index 00000000000..2d94dea0821 --- /dev/null +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.kt @@ -0,0 +1,37 @@ +/* + * Copyright 2010-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.lang.resolve + +import com.intellij.psi.PsiElement +import org.jetbrains.jet.lang.diagnostics.Diagnostic +import java.util.ArrayList + +public class SimpleDiagnostics(diagnostics: Collection) : Diagnostics { + //copy to prevent external change + private val diagnostics = ArrayList(diagnostics) + private val elementsCache = DiagnosticsElementsCache(this) + + override fun all() = diagnostics + + override fun forElement(psiElement: PsiElement) = elementsCache.getDiagnostics(psiElement) + + override fun noSuppression() = this + + override fun iterator() = all().iterator() + + override fun isEmpty() = all().isEmpty() +}