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

Create packages for surrounders for expression and for statements

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-02-13 17:31:51 +04:00
parent bf62bc0261
commit 68c3b3981b
8 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+2 -2
View File
@@ -111,8 +111,8 @@
<lang.findUsagesProvider language="jet" implementationClass="org.jetbrains.jet.plugin.findUsages.JetFindUsagesProvider"/>
<importFilteringRule implementation="org.jetbrains.jet.plugin.findUsages.JetImportFilteringRule"/>
<lang.refactoringSupport language="jet" implementationClass="org.jetbrains.jet.plugin.refactoring.JetRefactoringSupportProvider"/>
<lang.surroundDescriptor language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinExpressionSurroundDescriptor"/>
<lang.surroundDescriptor language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinStatementSurroundDescriptor"/>
<lang.surroundDescriptor language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.surroundWith.expression.KotlinExpressionSurroundDescriptor"/>
<lang.surroundDescriptor language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.surroundWith.statement.KotlinStatementSurroundDescriptor"/>
<quoteHandler fileType="Kotlin" className="org.jetbrains.jet.plugin.editor.KotlinQuoteHandler"/>
<refactoring.moveHandler implementation="org.jetbrains.jet.plugin.refactoring.move.JetMoveFilesOrDirectoriesHandler"/>
<refactoring.copyHandler implementation="org.jetbrains.jet.plugin.refactoring.copy.JetCopyClassHandler"/>
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinExpressionSurroundDescriptor.java → idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurroundDescriptor.java
+1 -2
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.plugin.codeInsight.surroundWith;
package org.jetbrains.jet.plugin.codeInsight.surroundWith.expression;
import com.intellij.lang.surroundWith.SurroundDescriptor;
import com.intellij.lang.surroundWith.Surrounder;
@@ -23,7 +23,6 @@ import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
public class KotlinExpressionSurroundDescriptor implements SurroundDescriptor {
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinNotSurrounder.java → idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinNotSurrounder.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jet.plugin.codeInsight.surroundWith;
package org.jetbrains.jet.plugin.codeInsight.surroundWith.expression;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.CodeInsightUtilBase;
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinIfElseSurrounder.java → idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinIfElseSurrounder.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.plugin.codeInsight.surroundWith;
package org.jetbrains.jet.plugin.codeInsight.surroundWith.statement;
import com.intellij.codeInsight.CodeInsightBundle;
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinIfSurrounder.java → idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinIfSurrounder.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.plugin.codeInsight.surroundWith;
package org.jetbrains.jet.plugin.codeInsight.surroundWith.statement;
import com.intellij.codeInsight.CodeInsightBundle;
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinIfSurrounderBase.java → idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java
+2 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.plugin.codeInsight.surroundWith;
package org.jetbrains.jet.plugin.codeInsight.surroundWith.statement;
import com.intellij.codeInsight.CodeInsightUtilBase;
@@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.psi.JetBlockExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetIfExpression;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils;
import java.lang.String;
idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinStatementSurroundDescriptor.java → idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinStatementSurroundDescriptor.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.plugin.codeInsight.surroundWith;
package org.jetbrains.jet.plugin.codeInsight.surroundWith.statement;
import com.intellij.lang.surroundWith.SurroundDescriptor;
import com.intellij.lang.surroundWith.Surrounder;
idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/AbstractSurroundWithTest.java
+3
View File
@@ -20,6 +20,9 @@ import com.intellij.codeInsight.generation.surroundWith.SurroundWithHandler;
import com.intellij.lang.surroundWith.Surrounder;
import com.intellij.testFramework.LightCodeInsightTestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.codeInsight.surroundWith.expression.KotlinNotSurrounder;
import org.jetbrains.jet.plugin.codeInsight.surroundWith.statement.KotlinIfElseSurrounder;
import org.jetbrains.jet.plugin.codeInsight.surroundWith.statement.KotlinIfSurrounder;
public abstract class AbstractSurroundWithTest extends LightCodeInsightTestCase {