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

Don't pass leading spaces to Java parser facade

Browse Source
This commit is contained in:
Roman Shevchenko
2010-12-16 14:51:10 +03:00
parent 8cfd6aa171
commit f742e0dc5d
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java
+1 -1
View File
@@ -176,7 +176,7 @@ public class VariableAccessFromInnerClassFix implements IntentionAction {
variableDeclarationStatement = factory.createVariableDeclarationStatement(variable.getName(), newType, init);
}
else {
PsiExpression init = factory.createExpressionFromText(" { " + initializer.getText() + " }", variable);
PsiExpression init = factory.createExpressionFromText("{ " + initializer.getText() + " }", variable);
variableDeclarationStatement = factory.createVariableDeclarationStatement(variable.getName(), newType, init);
}
PsiVariable newVariable = (PsiVariable)variableDeclarationStatement.getDeclaredElements()[0];
java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java
+2 -3
View File
@@ -395,7 +395,7 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor {
final CodeStyleManager codeStyleManager = manager.getCodeStyleManager();
@NonNls final StringBuilder fieldBuffer = new StringBuilder();
final String delegateVisibility = calculateDelegateVisibility();
fieldBuffer.append(delegateVisibility).append(' ');
if (delegateVisibility.length() > 0) fieldBuffer.append(delegateVisibility).append(' ');
fieldBuffer.append("final ");
final String fullyQualifiedName = StringUtil.getQualifiedName(newPackageName, newClassName);
fieldBuffer.append(fullyQualifiedName);
@@ -408,8 +408,7 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor {
}
fieldBuffer.append(' ');
fieldBuffer.append(delegateFieldName);
fieldBuffer.append('=');
fieldBuffer.append("new ").append(fullyQualifiedName);
fieldBuffer.append(" = new ").append(fullyQualifiedName);
if (!typeParams.isEmpty()) {
fieldBuffer.append('<');
for (PsiTypeParameter typeParameter : typeParams) {
plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/generator/GroovyToJavaGenerator.java
+16 -12
View File
@@ -288,7 +288,7 @@ public class GroovyToJavaGenerator {
}
if (method instanceof GrConstructor) {
writeConstructor(text, (GrConstructor)method, aClass.isEnum());
writeConstructor(text, (GrConstructor)method, aClass.isEnum(), true);
continue;
}
@@ -305,7 +305,7 @@ public class GroovyToJavaGenerator {
MethodSignature signature =
MethodSignatureUtil.createMethodSignature(method.getName(), parameterTypes, method.getTypeParameters(), PsiSubstitutor.EMPTY);
if (methodSignatures.add(signature)) {
writeMethod(text, method, parametersCopy);
writeMethod(text, method, parametersCopy, true);
}
PsiParameter parameter = parameters[i];
@@ -317,7 +317,7 @@ public class GroovyToJavaGenerator {
else {
MethodSignature signature = method.getSignature(PsiSubstitutor.EMPTY);
if (methodSignatures.add(signature)) {
writeMethod(text, method, parameters);
writeMethod(text, method, parameters, true);
}
}
}
@@ -407,7 +407,7 @@ public class GroovyToJavaGenerator {
if (block != null) {
text.append("{\n");
for (PsiMethod method : block.getMethods()) {
writeMethod(text, method, method.getParameterList().getParameters());
writeMethod(text, method, method.getParameterList().getParameters(), true);
}
text.append("}");
}
@@ -434,9 +434,11 @@ public class GroovyToJavaGenerator {
}
}
private void writeConstructor(final StringBuffer text, final GrConstructor constructor, boolean isEnum) {
text.append("\n");
text.append(" ");
private void writeConstructor(final StringBuffer text, final GrConstructor constructor, boolean isEnum, final boolean prefix) {
if (prefix) {
text.append("\n");
text.append(" ");
}
if (!isEnum) {
text.append("public ");
//writeMethodModifiers(text, constructor.getModifierList(), JAVA_MODIFIERS);
@@ -562,15 +564,15 @@ public class GroovyToJavaGenerator {
final GroovyToJavaGenerator generator = new GroovyToJavaGenerator(method.getProject(), null, Collections.<VirtualFile>emptyList());
final StringBuffer buffer = new StringBuffer();
if (method instanceof GrConstructor) {
generator.writeConstructor(buffer, (GrConstructor)method, false);
generator.writeConstructor(buffer, (GrConstructor)method, false, false);
}
else {
generator.writeMethod(buffer, method, method.getParameterList().getParameters());
generator.writeMethod(buffer, method, method.getParameterList().getParameters(), false);
}
return buffer.toString();
}
private void writeMethod(StringBuffer text, PsiMethod method, final PsiParameter[] parameters) {
private void writeMethod(StringBuffer text, PsiMethod method, final PsiParameter[] parameters, final boolean prefix) {
if (method == null) return;
String name = method.getName();
if (!JavaPsiFacade.getInstance(method.getProject()).getNameHelper().isIdentifier(name))
@@ -580,8 +582,10 @@ public class GroovyToJavaGenerator {
PsiModifierList modifierList = method.getModifierList();
text.append("\n");
text.append(" ");
if (prefix) {
text.append("\n");
text.append(" ");
}
writeMethodModifiers(text, modifierList, JAVA_MODIFIERS);
if (method.hasTypeParameters()) {
appendTypeParameters(text, method);