From 57ebd0e13aa5206f96828a1ec753c66ecb5735e2 Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Wed, 16 Sep 2020 00:26:57 +0300 Subject: [PATCH] [FIR IDE] Remove unused code and add logging to LightClassProvider Remove not used icons from independed icons provider Add class logging to KotlinUsageTypeProvider Remove redundant comments from LightClassProvider --- ...KtFirSymbolDeclarationOverridesProvider.kt | 4 +- .../kotlin/idea/KotlinIconsIndependent.java | 42 +------------------ .../kotlin/idea/asJava/LightClassProvider.kt | 4 -- 3 files changed, 4 insertions(+), 46 deletions(-) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt index b8351acc019..e553e176071 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt @@ -23,7 +23,7 @@ internal class KtFirSymbolDeclarationOverridesProvider( private fun FirTypeScope.processCallableByName(declaration: FirDeclaration) = when (declaration) { is FirSimpleFunction -> processFunctionsByName(declaration.name) { } is FirProperty -> processPropertiesByName(declaration.name) { } - else -> error { " Invalid FIR symbol to process " } + else -> error { "Invalid FIR symbol to process: ${declaration::class}" } } private fun FirTypeScope.processOverriddenDeclarations( @@ -32,7 +32,7 @@ internal class KtFirSymbolDeclarationOverridesProvider( ) = when (declaration) { is FirSimpleFunction -> processOverriddenFunctions(declaration.symbol) { processor.invoke(it.fir) } is FirProperty -> processOverriddenProperties(declaration.symbol) { processor.invoke(it.fir) } - else -> error { " Invalid FIR symbol to process " } + else -> error { "Invalid FIR symbol to process: ${declaration::class}" } } override fun getOverriddenSymbols( diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconsIndependent.java b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconsIndependent.java index 210bafa2753..fd8af9888a1 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconsIndependent.java +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconsIndependent.java @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 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 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.idea; @@ -25,8 +14,6 @@ import javax.swing.*; public interface KotlinIconsIndependent { Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin.svg"); - Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin13.svg"); - Icon CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classKotlin.svg"); Icon ABSTRACT_CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstractClassKotlin.svg"); Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/enumKotlin.svg"); @@ -40,18 +27,12 @@ public interface KotlinIconsIndependent { Icon EXTENSION_FUNCTION = PlatformIcons.FUNCTION_ICON; Icon ABSTRACT_EXTENSION_FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstract_extension_function.svg"); Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/lambda.svg"); - Icon VAR = PlatformIcons.VARIABLE_ICON; - Icon VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/value.svg"); Icon PARAMETER = PlatformIcons.PARAMETER_ICON; Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_value.svg"); Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_variable.svg"); Icon CLASS_INITIALIZER = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classInitializerKotlin.svg"); Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias.svg"); - Icon DSL_MARKER_ANNOTATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/dslMarkerAnnotation.svg"); - - Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall.svg"); - Icon ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual.svg"); Icon EXPECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect.svg"); @@ -61,23 +42,4 @@ public interface KotlinIconsIndependent { Icon JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_js.svg"); Icon MPP = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project.svg"); Icon NATIVE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_native.svg"); - - interface WizardIndependent { - Icon JVM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/jvm.svg"); - Icon JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/js.svg"); - Icon CONSOLE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/console.svg"); - Icon MULTIPLATFORM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/multiplatform.svg"); - Icon MULTIPLATFORM_LIBRARY = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/multiplatformLibrary.svg"); - Icon MULTIPLATFORM_MOBILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/multiplatformMobile.svg"); - Icon MULTIPLATFORM_MOBILE_LIBRARY = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/multiplatformMobileLibrary.svg"); - Icon NATIVE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/native.svg"); - Icon WEB = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/ppWeb.svg"); - Icon ANDROID = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/android.svg"); - Icon IOS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/ios.svg"); - Icon LINUX = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/linux.svg"); - Icon MAC_OS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/macOS.svg"); - Icon WINDOWS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/windows.svg"); - Icon NODE_JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/nodejs.svg"); - Icon REACT_JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/react.svg"); - } } diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/asJava/LightClassProvider.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/asJava/LightClassProvider.kt index f1df1d0c9a6..625bb04ff5c 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/asJava/LightClassProvider.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/asJava/LightClassProvider.kt @@ -24,10 +24,8 @@ interface LightClassProvider { fun getLightClassMethods(function: KtFunction): List - //getLightClassPropertyMethods.allDeclarations fun getLightClassParameterDeclarations(parameter: KtParameter): List - //getLightClassPropertyMethods.allDeclarations fun getLightClassPropertyDeclarations(property: KtProperty): List fun toLightClassWithBuiltinMapping(classOrObject: KtClassOrObject): PsiClass? @@ -60,11 +58,9 @@ interface LightClassProvider { fun providedGetLightClassMethods(function: KtFunction): List = getInstance(function.project).getLightClassMethods(function) - //getLightClassPropertyMethods.allDeclarations fun providedGetLightClassParameterDeclarations(parameter: KtParameter): List = getInstance(parameter.project).getLightClassParameterDeclarations(parameter) - //getLightClassPropertyMethods.allDeclarations fun providedGetLightClassPropertyDeclarations(property: KtProperty): List = getInstance(property.project).getLightClassPropertyDeclarations(property)