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

Remove other specific code after removing 182

Browse Source 
#KT-33536 Fixed
This commit is contained in:
Nikolay Krasko
2019-08-27 20:28:57 +03:00
parent 63f0eae7e2
commit d04749dd3f
8 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
-2
View File
@@ -61,8 +61,6 @@ public class KotlinCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
addBlankLinesTab(settings); addBlankLinesTab(settings);
addTab(new ImportSettingsPanelWrapper(settings)); addTab(new ImportSettingsPanelWrapper(settings));
// BUNCH: 182
//noinspection IncompatibleAPI
for (CodeStyleSettingsProvider provider : CodeStyleSettingsProvider.EXTENSION_POINT_NAME.getExtensions()) { for (CodeStyleSettingsProvider provider : CodeStyleSettingsProvider.EXTENSION_POINT_NAME.getExtensions()) {
if (provider.getLanguage() == KotlinLanguage.INSTANCE && !provider.hasSettingsPage()) { if (provider.getLanguage() == KotlinLanguage.INSTANCE && !provider.hasSettingsPage()) {
createTab(provider); createTab(provider);
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt
-1
View File
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.idea.KotlinIcons
import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension
import javax.swing.Icon import javax.swing.Icon
// BUNCH: 182
// BUNCH: as35 // BUNCH: as35
// BUNCH: as34 // BUNCH: as34
// BUNCH: 191 // BUNCH: 191
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.192
-1
View File
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.idea.KotlinIcons
import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension
import javax.swing.Icon import javax.swing.Icon
// BUNCH: 182
// BUNCH: as35 // BUNCH: as35
// BUNCH: as34 // BUNCH: as34
internal fun createDslStyleIcon(styleId: Int): Icon { internal fun createDslStyleIcon(styleId: Int): Icon {
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as34
-1
View File
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.highlighter.markers
import com.intellij.icons.AllIcons import com.intellij.icons.AllIcons
import javax.swing.Icon import javax.swing.Icon
// BUNCH: 182
// BUNCH: as35 // BUNCH: as35
// BUNCH: as34 // BUNCH: as34
internal fun createDslStyleIcon(styleId: Int): Icon { internal fun createDslStyleIcon(styleId: Int): Icon {
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as35
-1
View File
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.highlighter.markers
import com.intellij.icons.AllIcons import com.intellij.icons.AllIcons
import javax.swing.Icon import javax.swing.Icon
// BUNCH: 182
// BUNCH: as35 // BUNCH: as35
// BUNCH: as34 // BUNCH: as34
internal fun createDslStyleIcon(styleId: Int): Icon { internal fun createDslStyleIcon(styleId: Int): Icon {
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/dslStyleIcon.kt.as36
-1
View File
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.highlighter.markers
import com.intellij.icons.AllIcons import com.intellij.icons.AllIcons
import javax.swing.Icon import javax.swing.Icon
// BUNCH: 182
// BUNCH: as35 // BUNCH: as35
// BUNCH: as34 // BUNCH: as34
internal fun createDslStyleIcon(styleId: Int): Icon { internal fun createDslStyleIcon(styleId: Int): Icon {
plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/AndroidExtensionsReferenceSearchExecutor.kt
-1
View File
@@ -37,7 +37,6 @@ class AndroidExtensionsReferenceSearchExecutor : QueryExecutorBase<PsiReference,
override fun processQuery(queryParameters: ReferencesSearch.SearchParameters, consumer: Processor<in PsiReference>) { override fun processQuery(queryParameters: ReferencesSearch.SearchParameters, consumer: Processor<in PsiReference>) {
val elementToSearch = queryParameters.elementToSearch as? XmlAttributeValue ?: return val elementToSearch = queryParameters.elementToSearch as? XmlAttributeValue ?: return
val scopeElements = (queryParameters.effectiveSearchScope as? LocalSearchScope)?.scope ?: return val scopeElements = (queryParameters.effectiveSearchScope as? LocalSearchScope)?.scope ?: return
@Suppress("UNNECESSARY_SAFE_CALL", "USELESS_ELVIS") // BUNCH: 182
val referenceName = elementToSearch.value?.substringAfterLast("/") ?: return val referenceName = elementToSearch.value?.substringAfterLast("/") ?: return
scopeElements.filterIsInstance<KtElement>().forEach { scopeElements.filterIsInstance<KtElement>().forEach {
plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
-1
View File
@@ -51,7 +51,6 @@ class AndroidSimpleNameReferenceExtension : SimpleNameReferenceExtension {
return null return null
} }
@Suppress("UNNECESSARY_SAFE_CALL", "USELESS_ELVIS") // BUNCH: 182
private fun isIdDeclaration(declaration: XmlAttributeValue) = declaration.value?.startsWith("@+id/") ?: false private fun isIdDeclaration(declaration: XmlAttributeValue) = declaration.value?.startsWith("@+id/") ?: false
private fun KtSimpleNameReference.isReferenceToXmlFile(xmlFile: XmlFile): Boolean { private fun KtSimpleNameReference.isReferenceToXmlFile(xmlFile: XmlFile): Boolean {