Cleanup (warnings)

This commit is contained in:
Roman Shevchenko
2018-07-10 17:39:11 +02:00
parent 435bb6dcee
commit b949254598
2 changed files with 5 additions and 21 deletions
@@ -1,6 +1,4 @@
/*
* Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.java.codeInsight.daemon
import com.intellij.codeInsight.daemon.impl.JavaHighlightInfoTypes
@@ -290,9 +288,9 @@ class ModuleHighlightingTest : LightJava9ModulesCodeInsightFixtureTestCase() {
}}
""".trimIndent()
if (moduleFileInTests != checkFileInTests) {
checkFileText = Regex("(<error [^>]+>)([^<]+)(</error>)").replace(checkFileText, {
checkFileText = Regex("(<error [^>]+>)([^<]+)(</error>)").replace(checkFileText) {
if (it.value.contains("unreachable")) it.value else it.groups[2]!!.value
})
}
}
highlight("test.java", checkFileText, checkFileInTests)
}
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 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.
*/
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.java.codeInsight.daemon
import com.intellij.codeInsight.completion.CompletionType
@@ -69,7 +55,7 @@ class MultiReleaseJarTest : LightJava9ModulesCodeInsightFixtureTestCase() {
}
private fun assertUnversioned(element: PsiElement?) {
assertThat(element).isNotNull()
assertThat(element).isNotNull
assertThat(element!!.containingFile.virtualFile.path).doesNotContain("/META-INF/versions/")
}
}