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

i18n, KotlinSurrounderUtils: convert field to function

Browse Source 
#KT-37483
This commit is contained in:
Dmitry Gridin
2020-03-26 13:05:53 +07:00
parent 986bc3fb8f
commit c70809553f
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinSurrounderUtils.java
+8 -3
View File
@@ -19,8 +19,13 @@ import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilsKt;
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
public class KotlinSurrounderUtils { public class KotlinSurrounderUtils {
public static String SURROUND_WITH = KotlinIdeaCoreBundle.message("surround.with.title"); public static String SURROUND_WITH() {
public static String SURROUND_WITH_ERROR = KotlinIdeaCoreBundle.message("surround.with.error.cannot.perform.action"); return KotlinIdeaCoreBundle.message("surround.with.title");
}
public static String SURROUND_WITH_ERROR() {
return KotlinIdeaCoreBundle.message("surround.with.error.cannot.perform.action");
}
private KotlinSurrounderUtils() { private KotlinSurrounderUtils() {
} }
@@ -34,7 +39,7 @@ public class KotlinSurrounderUtils {
} }
public static void showErrorHint(@NotNull Project project, @NotNull Editor editor, @NotNull String message) { public static void showErrorHint(@NotNull Project project, @NotNull Editor editor, @NotNull String message) {
CodeInsightUtils.showErrorHint(project, editor, message, SURROUND_WITH, null); CodeInsightUtils.showErrorHint(project, editor, message, SURROUND_WITH(), null);
} }
public static boolean isUsedAsStatement(@NotNull KtExpression expression) { public static boolean isUsedAsStatement(@NotNull KtExpression expression) {
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class KotlinFunctionLiteralSurrounder extends KotlinStatementsSurrounder
statements = MoveDeclarationsOutHelperKt.move(container, statements, true); statements = MoveDeclarationsOutHelperKt.move(container, statements, true);
if (statements.length == 0) { if (statements.length == 0) {
KotlinSurrounderUtils.showErrorHint(project, editor, KotlinSurrounderUtils.SURROUND_WITH_ERROR); KotlinSurrounderUtils.showErrorHint(project, editor, KotlinSurrounderUtils.SURROUND_WITH_ERROR());
return null; return null;
} }
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java
+1 -1
View File
@@ -44,7 +44,7 @@ public abstract class KotlinIfSurrounderBase extends KotlinStatementsSurrounder
statements = MoveDeclarationsOutHelperKt.move(container, statements, isGenerateDefaultInitializers()); statements = MoveDeclarationsOutHelperKt.move(container, statements, isGenerateDefaultInitializers());
if (statements.length == 0) { if (statements.length == 0) {
KotlinSurrounderUtils.showErrorHint(project, editor, KotlinSurrounderUtils.SURROUND_WITH_ERROR); KotlinSurrounderUtils.showErrorHint(project, editor, KotlinSurrounderUtils.SURROUND_WITH_ERROR());
return null; return null;
} }
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java
+1 -1
View File
@@ -40,7 +40,7 @@ public abstract class KotlinTrySurrounderBase extends KotlinStatementsSurrounder
statements = MoveDeclarationsOutHelperKt.move(container, statements, true); statements = MoveDeclarationsOutHelperKt.move(container, statements, true);
if (statements.length == 0) { if (statements.length == 0) {
KotlinSurrounderUtils.showErrorHint(project, editor, KotlinSurrounderUtils.SURROUND_WITH_ERROR); KotlinSurrounderUtils.showErrorHint(project, editor, KotlinSurrounderUtils.SURROUND_WITH_ERROR());
return null; return null;
} }