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

optimize imports

Browse Source
This commit is contained in:
Mikhail Mutcianko
2014-08-22 18:16:43 +04:00
committed by Yan Zhulanow
parent 19e6b79cae
commit a56fa7f192
33 changed files with 543 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea.iml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<module type="JAVA_MODULE" version="4">
<component name="EclipseModuleManager">
<libelement value="jar://$MODULE_DIR$/../lib/asm-util-3.3.1.jar!/" />
<src_description expected_position="1">
idea/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt
+5 -5
View File
@@ -22,8 +22,6 @@ import com.intellij.psi.PsiElement
import java.util.HashMap
import com.intellij.psi.xml.XmlAttribute
import com.intellij.psi.PsiFile
import org.jetbrains.android.util.AndroidResourceUtil
import org.jetbrains.jps.android.AndroidJpsUtil
import org.jetbrains.android.facet.AndroidFacet
import org.jetbrains.jet.lang.resolve.android.AndroidManifest
import com.intellij.openapi.module.ModuleManager
@@ -31,7 +29,11 @@ import java.util.ArrayList
public class IDEAndroidResourceManager(project: Project, searchPath: String?) : AndroidResourceManagerBase(project, searchPath) {
class NoAndroidFacetException: Exception("No android facet found in project")
private class NoAndroidFacetException: Exception("No android facet found in project")
// TODO: synchronize!
// TODO: invalidate on modification?
private val idToXmlAttributeCache = HashMap<String, PsiElement>()
override fun getLayoutXmlFiles(): Collection<PsiFile> {
try {
@@ -56,8 +58,6 @@ public class IDEAndroidResourceManager(project: Project, searchPath: String?) :
return AndroidManifest(attributeValue!!.getRawText()!!)
}
private val idToXmlAttributeCache = HashMap<String, PsiElement>()
public fun addMapping(name: String, attr: XmlAttribute) {
idToXmlAttributeCache[name] = attr
}
idea/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlProcessor.kt
-1
View File
@@ -22,7 +22,6 @@ import java.util.ArrayList
import com.intellij.psi.PsiFile
import org.jetbrains.jet.lang.resolve.android.AndroidWidget
import org.jetbrains.jet.lang.resolve.android.KotlinStringWriter
import com.intellij.openapi.application.Application
import com.intellij.openapi.application.ApplicationManager
import org.jetbrains.jet.lang.resolve.android.CliAndroidResourceManager
import org.jetbrains.jet.lang.resolve.android.AndroidResourceManager
idea/tests/org/jetbrains/jet/android/AndroidPropertiesCompletionBasicTest.java
-6
View File
@@ -16,15 +16,9 @@
package org.jetbrains.jet.android;
import com.intellij.codeInsight.completion.CompletionType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.completion.AbstractJvmBasicCompletionTest;
import org.jetbrains.jet.completion.AbstractJvmSmartCompletionTest;
import org.jetbrains.jet.completion.AbstractMultiFileJvmBasicCompletionTest;
import org.jetbrains.jet.completion.JetFixtureCompletionBaseTestCase;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.android.TestConst;
import org.jetbrains.jet.plugin.project.TargetPlatform;
import org.jetbrains.jet.test.TestMetadata;
@TestMetadata("idea/testData/android/completion/")