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

[java-rd] IDEA-322563 clean up code

Browse Source 
-some methods get statics
-deleted unnecessary commas

GitOrigin-RevId: b48425975356467a7cca9fb5d50756778d37efc9
This commit is contained in:
Mikhail Pyltsin
2023-09-18 23:01:42 +00:00
committed by intellij-monorepo-bot
parent 9fed3df3e2
commit de67570ff3
8 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/JavaBackspaceHandler.java
+1 -1
View File
@@ -21,7 +21,7 @@ public class JavaBackspaceHandler extends BackspaceHandlerDelegate {
editor, JavaTokenType.DOT, JavaTokenType.IDENTIFIER, true);
}
private boolean isHigherThan50r(@Nullable PsiFile file){
private static boolean isHigherThan50r(@Nullable PsiFile file){
return file instanceof AbstractBasicJavaFile &&
AbstractBasicJavaDefinitionService.getJavaDefinitionService().getLanguageLevel(file).isAtLeast(LanguageLevel.JDK_1_5);
}
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/JavadocLineStartHandler.java
+3 -3
View File
@@ -5,7 +5,7 @@ import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorModificationUtil;
import com.intellij.openapi.editor.EditorModificationUtilEx;
import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
import com.intellij.openapi.project.Project;
@@ -60,7 +60,7 @@ public class JavadocLineStartHandler extends EditorActionHandler.ForEachCaret {
else {
caret.removeSelection();
}
EditorModificationUtil.scrollToCaret(editor);
EditorModificationUtilEx.scrollToCaret(editor);
return;
}
}
@@ -69,7 +69,7 @@ public class JavadocLineStartHandler extends EditorActionHandler.ForEachCaret {
myOriginalHandler.execute(editor, caret, dataContext);
}
private boolean isJavaFile(@Nullable PsiFile file){
private static boolean isJavaFile(@Nullable PsiFile file){
return file instanceof AbstractBasicJavaFile;
}
}
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/smartEnter/AfterSemicolonEnterProcessor.java
+13 -14
View File
@@ -8,7 +8,6 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiErrorElement;
import com.intellij.psi.PsiRecursiveElementWalkingVisitor;
import com.intellij.psi.impl.source.BasicJavaAstTreeUtil;
import com.intellij.psi.impl.source.BasicJavaElementType;
import com.intellij.util.text.CharArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -25,21 +24,21 @@ public class AfterSemicolonEnterProcessor implements ASTNodeEnterProcessor {
if (psiElement == null) {
return false;
}
if (BasicJavaAstTreeUtil.is(astNode, BasicJavaElementType.BASIC_EXPRESSION_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BasicJavaElementType.BASIC_DECLARATION_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BasicJavaElementType.BASIC_DO_WHILE_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BasicJavaElementType.BASIC_RETURN_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BasicJavaElementType.BASIC_THROW_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BasicJavaElementType.BASIC_BREAK_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BasicJavaElementType.BASIC_CONTINUE_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BasicJavaElementType.BASIC_YIELD_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BasicJavaElementType.BASIC_ASSERT_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, Set.of(BasicJavaElementType.BASIC_FIELD, BasicJavaElementType.BASIC_ENUM_CONSTANT)) ||
if (BasicJavaAstTreeUtil.is(astNode, BASIC_EXPRESSION_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BASIC_DECLARATION_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BASIC_DO_WHILE_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BASIC_RETURN_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BASIC_THROW_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BASIC_BREAK_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BASIC_CONTINUE_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BASIC_YIELD_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, BASIC_ASSERT_STATEMENT) ||
BasicJavaAstTreeUtil.is(astNode, Set.of(BASIC_FIELD, BASIC_ENUM_CONSTANT)) ||
isImportStatementBase(psiElement) ||
isMethodWithoutBody(psiElement)) {
int errorOffset = getErrorElementOffset(psiElement);
int elementEndOffset = astNode.getTextRange().getEndOffset();
if (BasicJavaAstTreeUtil.is(astNode, BasicJavaElementType.BASIC_ENUM_CONSTANT)) {
if (BasicJavaAstTreeUtil.is(astNode, BASIC_ENUM_CONSTANT)) {
final CharSequence text = editor.getDocument().getCharsSequence();
final int commaOffset = CharArrayUtil.shiftForwardUntil(text, elementEndOffset, ",");
if (commaOffset < text.length()) {
@@ -79,13 +78,13 @@ public class AfterSemicolonEnterProcessor implements ASTNodeEnterProcessor {
return true;
}
private boolean isMethodWithoutBody(@Nullable PsiElement psiElement){
private static boolean isMethodWithoutBody(@Nullable PsiElement psiElement){
ASTNode node = BasicJavaAstTreeUtil.toNode(psiElement);
return BasicJavaAstTreeUtil.is(node, BASIC_METHOD) &&
!shouldHaveBody(node);
}
private boolean isImportStatementBase(@Nullable PsiElement psiElement){
private static boolean isImportStatementBase(@Nullable PsiElement psiElement){
ASTNode node = BasicJavaAstTreeUtil.toNode(psiElement);
return
BasicJavaAstTreeUtil.is(node, BASIC_IMPORT_STATEMENT) ||
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/smartEnter/ForStatementFixer.java
+2 -2
View File
@@ -80,8 +80,8 @@ public class ForStatementFixer implements Fixer {
* @param lastValidForPart last valid element of the target 'for' loop
* @param forStatement PSI element for the target 'for' loop
*/
private void registerErrorOffset(@NotNull Editor editor, @NotNull AbstractBasicJavaSmartEnterProcessor processor,
@NotNull ASTNode lastValidForPart, @NotNull ASTNode forStatement) {
private static void registerErrorOffset(@NotNull Editor editor, @NotNull AbstractBasicJavaSmartEnterProcessor processor,
@NotNull ASTNode lastValidForPart, @NotNull ASTNode forStatement) {
final Project project = editor.getProject();
int offset = lastValidForPart.getTextRange().getEndOffset();
if (project != null && CodeStyle.getSettings(editor).getCommonSettings(JavaLanguage.INSTANCE).SPACE_AFTER_COMMA) {
java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicDeclarationParser.java
-3
View File
@@ -29,7 +29,6 @@ public class BasicDeclarationParser {
FILE, CLASS, CODE_BLOCK, ANNOTATION_INTERFACE
}
private final TokenSet AFTER_END_DECLARATION_SET;
private static final TokenSet BEFORE_LBRACE_ELEMENTS_SET = TokenSet.create(
JavaTokenType.IDENTIFIER, JavaTokenType.COMMA, JavaTokenType.EXTENDS_KEYWORD, JavaTokenType.IMPLEMENTS_KEYWORD, JavaTokenType.LPARENTH);
private static final TokenSet APPEND_TO_METHOD_SET = TokenSet.create(
@@ -51,8 +50,6 @@ public class BasicDeclarationParser {
public BasicDeclarationParser(@NotNull final BasicJavaParser javaParser) {
myParser = javaParser;
myJavaElementTypeContainer = javaParser.getJavaElementTypeFactory().getContainer();
AFTER_END_DECLARATION_SET = TokenSet.create(
myJavaElementTypeContainer.FIELD, myJavaElementTypeContainer.METHOD);
TYPE_START = TokenSet.orSet(
PRIMITIVE_TYPE_BIT_SET.toTokenSet(),
TokenSet.create(JavaTokenType.IDENTIFIER, JavaTokenType.AT, JavaTokenType.VAR_KEYWORD));
java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicJavaParser.java
-3
View File
@@ -1,7 +1,6 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.lang.java.parser;
import com.intellij.psi.impl.source.AbstractBasicJavaDocElementTypeFactory;
import com.intellij.psi.impl.source.AbstractBasicJavaElementTypeFactory;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
@@ -30,7 +29,5 @@ abstract public class BasicJavaParser {
@NotNull
abstract public BasicPatternParser getPatternParser();
abstract public AbstractBasicJavaDocElementTypeFactory getJavaDocElementTypeFactory();
abstract public AbstractBasicJavaElementTypeFactory getJavaElementTypeFactory();
}
java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicOldExpressionParser.java
+4
View File
@@ -57,11 +57,15 @@ public class BasicOldExpressionParser {
return parseAssignment(builder);
}
//for compatibility
@SuppressWarnings("unused")
@Nullable
PsiBuilder.Marker parse(@NotNull PsiBuilder builder, final int mode) {
return parseAssignment(builder, mode);
}
//for compatibility
@SuppressWarnings("unused")
@Nullable
public PsiBuilder.Marker parseCaseLabel(@NotNull PsiBuilder builder) {
return myParser.getStatementParser().parseCaseLabel(builder).first;
java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParser.java
-6
View File
@@ -15,9 +15,7 @@
*/
package com.intellij.lang.java.parser;
import com.intellij.psi.impl.source.AbstractBasicJavaDocElementTypeFactory;
import com.intellij.psi.impl.source.AbstractBasicJavaElementTypeFactory;
import com.intellij.psi.impl.source.tree.JavaDocElementTypeFactory;
import com.intellij.psi.impl.source.tree.JavaElementTypeFactory;
import org.jetbrains.annotations.NotNull;
@@ -83,10 +81,6 @@ public class JavaParser extends BasicJavaParser {
public PatternParser getPatternParser() {
return myPatternParser;
}
@Override
public AbstractBasicJavaDocElementTypeFactory getJavaDocElementTypeFactory() {
return JavaDocElementTypeFactory.INSTANCE;
}
@Override
public AbstractBasicJavaElementTypeFactory getJavaElementTypeFactory() {