Cleanup (formatting; naming)

This commit is contained in:
Roman Shevchenko
2017-12-05 10:53:23 +01:00
parent 052af4483e
commit 4577f8edb4
@@ -1,17 +1,5 @@
/*
* 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-2017 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 org.jetbrains.java.decompiler
@@ -181,9 +169,7 @@ class IdeaDecompilerTest : LightCodeInsightFixtureTestCase() {
println(file.path)
}
else if (file.fileType === StdFileTypes.CLASS && !file.name.contains('$')) {
val clsFile = psiManager.findFile(file)!!
val mirror = (clsFile as ClsFileImpl).mirror
val decompiled = mirror.text
val decompiled = (psiManager.findFile(file)!! as ClsFileImpl).mirror.text
assertTrue(file.path, decompiled.startsWith(IdeaDecompiler.BANNER) || file.name == "package-info.class")
// check that no mapped line number is on an empty line
@@ -196,9 +182,9 @@ class IdeaDecompilerTest : LightCodeInsightFixtureTestCase() {
}
}
else if (ArchiveFileType.INSTANCE == file.fileType) {
val jarFile = JarFileSystem.getInstance().getRootByLocal(file)
if (jarFile != null) {
VfsUtilCore.visitChildrenRecursively(jarFile, this)
val jarRoot = JarFileSystem.getInstance().getRootByLocal(file)
if (jarRoot != null) {
VfsUtilCore.visitChildrenRecursively(jarRoot, this)
}
}