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

Moved live templates support into separate module

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-11-19 13:36:05 +01:00
parent c6df1b6dce
commit b8dadeb4cc
18 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/artifacts/KotlinPlugin.xml
Generated
+1
View File
@@ -46,6 +46,7 @@
<element id="module-output" name="container" />
<element id="module-output" name="rmi-interface" />
<element id="module-output" name="idea-repl" />
<element id="module-output" name="idea-live-templates" />
</element>
<element id="library" level="project" name="javax.inject" />
<element id="directory" name="jps">
.idea/modules.xml
Generated
+1
View File
@@ -37,6 +37,7 @@
<module fileurl="file://$PROJECT_DIR$/idea/idea-core/idea-core.iml" filepath="$PROJECT_DIR$/idea/idea-core/idea-core.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" filepath="$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-js/idea-js.iml" filepath="$PROJECT_DIR$/idea/idea-js/idea-js.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-live-templates/idea-live-templates.iml" filepath="$PROJECT_DIR$/idea/idea-live-templates/idea-live-templates.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" filepath="$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" />
<module fileurl="file://$PROJECT_DIR$/idea-runner/idea-runner.iml" filepath="$PROJECT_DIR$/idea-runner/idea-runner.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" filepath="$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" group="ide" />
idea/idea-live-templates/idea-live-templates.iml
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-runtime" level="project" />
<orderEntry type="module" module-name="idea-core" />
<orderEntry type="module" module-name="descriptors" />
<orderEntry type="library" name="idea-full" level="project" />
<orderEntry type="module" module-name="idea-analysis" />
<orderEntry type="module" module-name="frontend" />
<orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
<orderEntry type="module" module-name="idea" scope="RUNTIME" />
<orderEntry type="library" scope="RUNTIME" name="junit-plugin" level="project" />
</component>
</module>
idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java → idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
View File
idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt → idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt
View File
idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinTemplateContextType.java → idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinTemplateContextType.java
View File
idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt → idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt
View File
idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt → idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt
View File
idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnyVariableMacro.kt → idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnyVariableMacro.kt
View File
idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.kt → idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.kt
View File
idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.kt → idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.kt
View File
idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinPsiElementResult.kt → idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinPsiElementResult.kt
View File
idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt → idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt
View File
idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuitableVariableMacro.kt → idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuitableVariableMacro.kt
View File
idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt → idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesContextTest.kt
+1 -2
View File
@@ -14,11 +14,10 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.codeInsight
package org.jetbrains.kotlin.idea.liveTemplates
import com.intellij.codeInsight.template.TemplateContextType
import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import java.io.File
idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java → idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.java
+5 -4
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.codeInsight;
package org.jetbrains.kotlin.idea.liveTemplates;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupEx;
@@ -30,6 +30,7 @@ import com.intellij.openapi.editor.actionSystem.EditorActionManager;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ui.UIUtil;
import junit.framework.TestCase;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
@@ -260,7 +261,7 @@ public class LiveTemplatesTest extends KotlinLightCodeInsightFixtureTestCase {
}
private void checkAfter() {
assertNull(getTemplateState());
TestCase.assertNull(getTemplateState());
myFixture.checkResultByFile(getTestName(true) + ".exp.kt", true);
}
@@ -315,12 +316,12 @@ public class LiveTemplatesTest extends KotlinLightCodeInsightFixtureTestCase {
}
private void assertStringItems(@NonNls String... items) {
assertEquals(Arrays.asList(items), Arrays.asList(getItemStringsSorted()));
TestCase.assertEquals(Arrays.asList(items), Arrays.asList(getItemStringsSorted()));
}
private String[] getItemStrings() {
LookupEx lookup = LookupManager.getActiveLookup(myFixture.getEditor());
assertNotNull(lookup);
TestCase.assertNotNull(lookup);
ArrayList<String> result = new ArrayList<String>();
for (LookupElement element : lookup.getItems()) {
result.add(element.getLookupString());
idea/idea.iml
+2 -1
View File
@@ -45,11 +45,12 @@
<orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
<orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
<orderEntry type="library" name="markdown" level="project" />
<orderEntry type="module" module-name="idea-completion" scope="TEST" />
<orderEntry type="module" module-name="idea-completion" exported="" scope="RUNTIME" />
<orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
<orderEntry type="module" module-name="js.serializer" />
<orderEntry type="module" module-name="idea-js" scope="TEST" />
<orderEntry type="module" module-name="kotlinr" />
<orderEntry type="module" module-name="idea-repl" scope="TEST" />
<orderEntry type="module" module-name="idea-live-templates" exported="" scope="RUNTIME" />
</component>
</module>
plugins/android-idea-plugin/android-idea-plugin.iml
+1
View File
@@ -20,5 +20,6 @@
<orderEntry type="library" name="kotlin-runtime" level="project" />
<orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
<orderEntry type="module" module-name="frontend.java" scope="TEST" />
<orderEntry type="module" module-name="idea-live-templates" scope="TEST" />
</component>
</module>