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

Fix compilation error

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-07-23 10:42:50 +03:00
committed by Nikolay Krasko
parent fbe192b75f
commit 93a3d3a4c4
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt
+1 -1
View File
@@ -52,7 +52,7 @@ import javax.swing.JComponent
public class KotlinFieldBreakpointType : JavaBreakpointType<KotlinPropertyBreakpointProperties>, XLineBreakpointType<KotlinPropertyBreakpointProperties>( public class KotlinFieldBreakpointType : JavaBreakpointType<KotlinPropertyBreakpointProperties>, XLineBreakpointType<KotlinPropertyBreakpointProperties>(
"kotlin-field", JetBundle.message("debugger.field.watchpoints.tab.title") "kotlin-field", JetBundle.message("debugger.field.watchpoints.tab.title")
) { ) {
override fun createJavaBreakpoint(project: Project, breakpoint: XBreakpoint<KotlinPropertyBreakpointProperties>): Breakpoint<*> { override fun createJavaBreakpoint(project: Project, breakpoint: XBreakpoint<KotlinPropertyBreakpointProperties>): Breakpoint<KotlinPropertyBreakpointProperties> {
return KotlinFieldBreakpoint(project, breakpoint) return KotlinFieldBreakpoint(project, breakpoint)
} }
plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt
+1 -1
View File
@@ -40,7 +40,7 @@ public class AndroidGotoDeclarationHandler : GotoDeclarationHandler {
val moduleInfo = sourceElement.getModuleInfo() val moduleInfo = sourceElement.getModuleInfo()
if (moduleInfo !is ModuleSourceInfo) return null if (moduleInfo !is ModuleSourceInfo) return null
val parser = ModuleServiceManager.getService(moduleInfo.module, javaClass<AndroidUIXmlProcessor>()) val parser = ModuleServiceManager.getService(moduleInfo.module, javaClass<AndroidUIXmlProcessor>())!!
val psiElements = parser.resourceManager.propertyToXmlAttributes(property) val psiElements = parser.resourceManager.propertyToXmlAttributes(property)
val valueElements = psiElements.map { (it as? XmlAttribute)?.getValueElement() as? PsiElement }.filterNotNull() val valueElements = psiElements.map { (it as? XmlAttribute)?.getValueElement() as? PsiElement }.filterNotNull()
if (valueElements.isNotEmpty()) return valueElements.toTypedArray() if (valueElements.isNotEmpty()) return valueElements.toTypedArray()
plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt
+2 -2
View File
@@ -93,7 +93,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
) { ) {
val module = jetProperty.getModule() ?: return val module = jetProperty.getModule() ?: return
val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>()) val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())!!
val resourceManager = processor.resourceManager val resourceManager = processor.resourceManager
val psiElements = resourceManager.propertyToXmlAttributes(jetProperty).map { it as? XmlAttribute }.filterNotNull() val psiElements = resourceManager.propertyToXmlAttributes(jetProperty).map { it as? XmlAttribute }.filterNotNull()
@@ -120,7 +120,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
val module = attribute.getModule() ?: ModuleUtilCore.findModuleForFile( val module = attribute.getModule() ?: ModuleUtilCore.findModuleForFile(
attribute.getContainingFile().getVirtualFile(), attribute.getProject()) ?: return attribute.getContainingFile().getVirtualFile(), attribute.getProject()) ?: return
val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>()) val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())!!
if (element == null) return if (element == null) return
val oldPropName = AndroidResourceUtil.getResourceNameByReferenceText(attribute.getValue()) val oldPropName = AndroidResourceUtil.getResourceNameByReferenceText(attribute.getValue())
val newPropName = idToName(newName) val newPropName = idToName(newName)
plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidExternalDeclarationsProvider.kt
+1 -1
View File
@@ -30,7 +30,7 @@ public class IDEAndroidExternalDeclarationsProvider(private val project: Project
if (moduleInfo !is ModuleSourceInfo) return listOf() if (moduleInfo !is ModuleSourceInfo) return listOf()
val module = moduleInfo.module val module = moduleInfo.module
val parser = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>()) val parser = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())!!
val syntheticFiles = parser.parseToPsi() val syntheticFiles = parser.parseToPsi()
syntheticFiles?.forEach { it.moduleInfo = moduleInfo } syntheticFiles?.forEach { it.moduleInfo = moduleInfo }