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

Code Style API usage fixes

Browse Source
This commit is contained in:
Rustam Vishnyakov
2017-11-27 15:16:06 +03:00
parent c2b650a8f7
commit cc3693c09c
15 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/ArrayMemberAccess.java
+3 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.codeInsight.completion;
import com.intellij.codeInsight.lookup.ExpressionLookupItem;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.util.Iconable;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
@@ -45,7 +46,8 @@ class ArrayMemberAccess {
FeatureUsageTracker.getInstance().triggerFeatureUsed(JavaCompletionFeatures.SECOND_SMART_COMPLETION_ARRAY_MEMBER);
final int tailOffset = context.getTailOffset();
final String callSpace = getSpace(CodeStyleSettingsManager.getSettings(element.getProject()).SPACE_WITHIN_BRACKETS);
final String callSpace = getSpace(
CodeStyleSettingsManager.getSettings(element.getProject()).getCommonSettings(JavaLanguage.INSTANCE).SPACE_WITHIN_BRACKETS);
context.getDocument().insertString(tailOffset, "[" + callSpace + callSpace + "]");
context.getEditor().getCaretModel().moveToOffset(tailOffset + 1 + callSpace.length());
}
java/java-impl/src/com/intellij/codeInsight/completion/FromArrayConversion.java
+3 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.codeInsight.completion;
import com.intellij.codeInsight.lookup.ExpressionLookupItem;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
@@ -56,7 +57,8 @@ class FromArrayConversion {
int startOffset = context.getStartOffset() - qualifierText.length();
final Project project = element.getProject();
final String callSpace = getSpace(CodeStyleSettingsManager.getSettings(project).SPACE_WITHIN_METHOD_CALL_PARENTHESES);
final String callSpace = getSpace(
CodeStyleSettingsManager.getSettings(project).getCommonSettings(JavaLanguage.INSTANCE).SPACE_WITHIN_METHOD_CALL_PARENTHESES);
final String newText = "java.util.Arrays." + methodName + "(" + callSpace + qualifierText + prefix + callSpace + ")";
context.getDocument().replaceString(startOffset, context.getTailOffset(), newText);
java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java
+3 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementDecorator;
import com.intellij.codeInsight.lookup.LookupElementPresentation;
import com.intellij.codeInsight.lookup.TypedLookupItem;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.util.ClassConditionKey;
import com.intellij.openapi.util.Key;
@@ -123,7 +124,8 @@ public class JavaChainLookupElement extends LookupElementDecorator<LookupElement
int start = CharArrayUtil.shiftForward(context.getDocument().getCharsSequence(), context.getStartOffset(), " \t\n");
if (shouldParenthesizeQualifier(context.getFile(), start, qualifierContext.getTailOffset())) {
final String space = CodeStyleSettingsManager.getSettings(qualifierContext.getProject()).SPACE_WITHIN_PARENTHESES ? " " : "";
final String space = CodeStyleSettingsManager.getSettings(qualifierContext.getProject())
.getCommonSettings(JavaLanguage.INSTANCE).SPACE_WITHIN_PARENTHESES ? " " : "";
document.insertString(start, "(" + space);
document.insertString(qualifierContext.getTailOffset(), space + ")");
}
java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java
+2 -1
View File
@@ -25,6 +25,7 @@ import com.intellij.codeInspection.SuppressionUtilCore;
import com.intellij.codeInspection.javaDoc.JavaDocLocalInspection;
import com.intellij.codeInspection.javaDoc.JavaDocLocalInspectionBase;
import com.intellij.codeInspection.javaDoc.JavadocHighlightUtil;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.project.Project;
@@ -453,7 +454,7 @@ public class JavaDocCompletionContributor extends CompletionContributor {
if (i < parameters.length - 1) {
buffer.append(",");
if (styleSettings.SPACE_AFTER_COMMA) buffer.append(" ");
if (styleSettings.getCommonSettings(JavaLanguage.INSTANCE).SPACE_AFTER_COMMA) buffer.append(" ");
}
}
buffer.append(")");
java/java-impl/src/com/intellij/codeInsight/completion/JavaPsiClassReferenceElement.java
+2 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.codeInsight.completion;
import com.intellij.codeInsight.TailType;
import com.intellij.codeInsight.lookup.*;
import com.intellij.codeInsight.lookup.impl.JavaElementLookupRenderer;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.util.ClassConditionKey;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.text.StringUtil;
@@ -216,7 +217,7 @@ public class JavaPsiClassReferenceElement extends LookupItem<Object> implements
}
private static boolean showSpaceAfterComma(PsiClass element) {
return CodeStyleSettingsManager.getSettings(element.getProject()).SPACE_AFTER_COMMA;
return CodeStyleSettingsManager.getSettings(element.getProject()).getCommonSettings(JavaLanguage.INSTANCE).SPACE_AFTER_COMMA;
}
}
java/java-impl/src/com/intellij/codeInsight/completion/SlowerTypeConversions.java
+4 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.codeInsight.completion;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
@@ -121,7 +122,9 @@ class SlowerTypeConversions implements Runnable {
if (PsiType.VOID.equals(type) || PsiType.NULL.equals(type)) return null;
if (method.getParameterList().getParametersCount() > 0) return null;
return method.getName() + "(" +
getSpace(CodeStyleSettingsManager.getSettings(method.getProject()).SPACE_WITHIN_METHOD_CALL_PARENTHESES) + ")"; }
getSpace(CodeStyleSettingsManager.getSettings(method.getProject())
.getCommonSettings(JavaLanguage.INSTANCE).SPACE_WITHIN_METHOD_CALL_PARENTHESES) + ")";
}
else if (o instanceof PsiVariable) {
return ((PsiVariable)o).getName();
}
java/java-impl/src/com/intellij/codeInsight/completion/ToArrayConversion.java
+5 -2
View File
@@ -18,6 +18,7 @@ package com.intellij.codeInsight.completion;
import com.intellij.codeInsight.lookup.ExpressionLookupItem;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.psi.util.PsiUtil;
@@ -46,7 +47,8 @@ public class ToArrayConversion {
return;
}
final String bracketSpace = getSpace(CodeStyleSettingsManager.getSettings(element.getProject()).SPACE_WITHIN_BRACKETS);
final String bracketSpace =
getSpace(CodeStyleSettingsManager.getSettings(element.getProject()).getCommonSettings(JavaLanguage.INSTANCE).SPACE_WITHIN_BRACKETS);
boolean hasEmptyArrayField = false;
final PsiClass psiClass = PsiUtil.resolveClassInType(type);
if (psiClass != null) {
@@ -81,7 +83,8 @@ public class ToArrayConversion {
}
private static void addToArrayConversion(final PsiElement element, final String prefix, @NonNls final String expressionString, @NonNls String presentableString, final Consumer<LookupElement> result, PsiElement qualifier) {
final boolean callSpace = CodeStyleSettingsManager.getSettings(element.getProject()).SPACE_WITHIN_METHOD_CALL_PARENTHESES;
final boolean callSpace = CodeStyleSettingsManager.getSettings(element.getProject())
.getCommonSettings(JavaLanguage.INSTANCE).SPACE_WITHIN_METHOD_CALL_PARENTHESES;
final PsiExpression conversion;
try {
conversion = createExpression(
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/ForStatementFixer.java
+2 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.codeInsight.editorActions.smartEnter;
import com.intellij.lang.ASTNode;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.TextRange;
@@ -95,7 +96,7 @@ public class ForStatementFixer implements Fixer {
{
final Project project = editor.getProject();
int offset = lastValidForPart.getTextRange().getEndOffset();
if (project != null && CodeStyleSettingsManager.getSettings(project).SPACE_AFTER_COMMA) {
if (project != null && CodeStyleSettingsManager.getSettings(project).getCommonSettings(JavaLanguage.INSTANCE).SPACE_AFTER_COMMA) {
if (editor.getDocument().getCharsSequence().charAt(lastValidForPart.getTextRange().getEndOffset() - 1) != ';') {
offset++;
}
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java
+3 -2
View File
@@ -18,6 +18,7 @@ package com.intellij.codeInsight.editorActions.smartEnter;
import com.intellij.codeInsight.CodeInsightUtil;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.actionSystem.IdeActions;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
@@ -31,8 +32,8 @@ import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.text.CharArrayUtil;
@@ -326,7 +327,7 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor {
if (CharArrayUtil.regionMatches(chars, caretOffset - "{}".length(), "{}") ||
CharArrayUtil.regionMatches(chars, caretOffset - "{\n}".length(), "{\n}")) {
commit(editor);
final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(file.getProject());
final CommonCodeStyleSettings settings = CodeStyleSettingsManager.getSettings(file.getProject()).getCommonSettings(JavaLanguage.INSTANCE);
final boolean old = settings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE;
settings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = false;
PsiElement leaf = file.findElementAt(caretOffset - 1);
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java
+3 -2
View File
@@ -16,6 +16,7 @@
package com.intellij.codeInsight.editorActions.smartEnter;
import com.intellij.lang.ASTNode;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
@@ -77,7 +78,7 @@ public class SemicolonFixer implements Fixer {
}
String toInsert = ";";
if (CodeStyleSettingsManager.getSettings(psiElement.getProject()).SPACE_AFTER_SEMICOLON) {
if (CodeStyleSettingsManager.getSettings(psiElement.getProject()).getCommonSettings(JavaLanguage.INSTANCE).SPACE_AFTER_SEMICOLON) {
toInsert += " ";
}
document.insertString(range.getEndOffset(), toInsert);
@@ -133,7 +134,7 @@ public class SemicolonFixer implements Fixer {
if (((PsiForStatement)parent).getUpdate() == psiElement) {
return false;
}
if (CodeStyleSettingsManager.getSettings(psiElement.getProject()).SPACE_AFTER_SEMICOLON) {
if (CodeStyleSettingsManager.getSettings(psiElement.getProject()).getCommonSettings(JavaLanguage.INSTANCE).SPACE_AFTER_SEMICOLON) {
toInsert += " ";
}
}
java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocCodeStyleImpl.java
+4 -3
View File
@@ -1,8 +1,9 @@
package com.intellij.codeInsight.javadoc;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.project.Project;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
public class JavaDocCodeStyleImpl extends JavaDocCodeStyle {
private final Project myProject;
@@ -13,13 +14,13 @@ public class JavaDocCodeStyleImpl extends JavaDocCodeStyle {
@Override
public boolean spaceBeforeComma() {
CodeStyleSettings styleSettings = CodeStyleSettingsManager.getSettings(myProject);
CommonCodeStyleSettings styleSettings = CodeStyleSettingsManager.getSettings(myProject).getCommonSettings(JavaLanguage.INSTANCE);
return styleSettings.SPACE_BEFORE_COMMA;
}
@Override
public boolean spaceAfterComma() {
CodeStyleSettings styleSettings = CodeStyleSettingsManager.getSettings(myProject);
CommonCodeStyleSettings styleSettings = CodeStyleSettingsManager.getSettings(myProject).getCommonSettings(JavaLanguage.INSTANCE);
return styleSettings.SPACE_AFTER_COMMA;
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/CompleteStatementTest.java
+4 -4
View File
@@ -131,9 +131,9 @@ public class CompleteStatementTest extends EditorActionTestCase {
public void testSCR37331() { doTest(); }
public void testIDEADEV434() {
mySettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = true;
mySettings.getCommonSettings(JavaLanguage.INSTANCE).KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = true;
doTest();
mySettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = false;
mySettings.getCommonSettings(JavaLanguage.INSTANCE).KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = false;
doTest();
}
@@ -159,10 +159,10 @@ public class CompleteStatementTest extends EditorActionTestCase {
public void testIDEADEV13019() { doTestBracesNextLineStyle(); }
public void testIDEA25139() { doTestBracesNextLineStyle(); }
public void testClassBracesNextLine() { doTestBracesNextLineStyle(); }
public void testBeforeIfRBrace() { mySettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = true; doTest(); }
public void testBeforeIfRBrace() { mySettings.getCommonSettings(JavaLanguage.INSTANCE).KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = true; doTest(); }
public void testNoUnnecessaryEmptyLineAtCodeBlock() { doTest(); }
public void testForStatementGeneration() { doTest(); }
public void testSpaceAfterSemicolon() { mySettings.SPACE_AFTER_SEMICOLON = true; doTest(); }
public void testSpaceAfterSemicolon() { mySettings.getCommonSettings(JavaLanguage.INSTANCE).SPACE_AFTER_SEMICOLON = true; doTest(); }
public void testNoSpaceAfterSemicolon() { myJavaSettings.SPACE_AFTER_SEMICOLON = false; doTest(); }
public void testForUpdateGeneration() { doTest(); }
public void testValidCodeBlock() { doTest(); }
java/java-tests/testSrc/com/intellij/java/codeInsight/GenerateConstructorTest.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class GenerateConstructorTest extends LightCodeInsightFixtureTestCase {
public void testSubstitution() { doTest(true); }
public void testImmediatelyAfterRBrace() { // IDEADEV-28811
CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings().CLASS_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
CodeStyleSettingsManager.getSettings(getProject()).getCommonSettings(JavaLanguage.INSTANCE).CLASS_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
doTest();
}
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/CreateClassFromNewTest.java
+2 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.java.codeInsight.daemon.quickFix;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
/**
@@ -25,7 +26,7 @@ public class CreateClassFromNewTest extends LightQuickFixParameterizedTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
CodeStyleSettingsManager.getSettings(getProject()).SPACE_BEFORE_CLASS_LBRACE = true;
CodeStyleSettingsManager.getSettings(getProject()).getCommonSettings(JavaLanguage.INSTANCE).SPACE_BEFORE_CLASS_LBRACE = true;
}
public void test() {
java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.java
+1 -1
View File
@@ -541,7 +541,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
public void testDoNotMergeCommentLines() {
getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
getJavaSettings().JD_PRESERVE_LINE_FEEDS = true;
getSettings().getRootSettings().WRAP_COMMENTS = true;
getSettings().WRAP_COMMENTS = true;
doClassTest(
"/**\n" +