MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

convert char variables with initializers

Browse Source
This commit is contained in:
Maxim Medvedev
2011-04-19 14:54:24 +04:00
parent 30d04a30f2
commit efbbb82813
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java
+12 -1
View File
@@ -46,6 +46,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrAnonymousC
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrGdkMethod;
import org.jetbrains.plugins.groovy.lang.psi.api.types.*;
import org.jetbrains.plugins.groovy.lang.psi.expectedTypes.GroovyExpectedTypesProvider;
import org.jetbrains.plugins.groovy.lang.psi.expectedTypes.SubtypeConstraint;
import org.jetbrains.plugins.groovy.lang.psi.expectedTypes.TypeConstraint;
import org.jetbrains.plugins.groovy.lang.psi.impl.GrLiteralClassType;
import org.jetbrains.plugins.groovy.lang.psi.impl.GrRangeType;
@@ -536,7 +537,17 @@ public class ExpressionGenerator extends Generator {
else {
value = literal.getValue();
}
if (value instanceof String) {
boolean isChar = false;
for (TypeConstraint constraint : constraints) {
if (constraint instanceof SubtypeConstraint && TypesUtil.unboxPrimitiveTypeWrapper(constraint.getDefaultType()) == PsiType.CHAR) {
isChar = true;
}
}
if (isChar) {
builder.append('\'').append(StringUtil.escapeQuotes(String.valueOf(value))).append('\'');
}
else if (value instanceof String) {
builder.append('"').append(StringUtil.escapeQuotes((String)value)).append('"');
}
else {
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerationTest.groovy
+1
View File
@@ -171,4 +171,5 @@ final class Matcher {
}
void testAsBoolean() {doTest()}
void testCharInitializer() {doTest()}
}
plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/charInitializer.java
Vendored
+2
View File
@@ -0,0 +1,2 @@
char c = 'a';
print(c);