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

[java] IDEA-365317 delete JavaBinaryOperations and BasicJavaElementTypeConverter

Browse Source 
GitOrigin-RevId: afa1d288c6a36788a07226e34528415ee0fa7200
This commit is contained in:
Mikhail Pyltsin
2025-11-20 12:44:51 +00:00
committed by intellij-monorepo-bot
parent 636f753d46
commit bf22495377
15 changed files with 98 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/JavaTypingTokenSets.java
+3 -3
View File
@@ -1,8 +1,8 @@
// 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.codeInsight.editorActions;
import com.intellij.lang.java.parser.JavaBinaryOperations;
import com.intellij.psi.JavaTokenType;
import com.intellij.psi.impl.source.tree.ElementType;
import com.intellij.psi.tree.TokenSet;
public final class JavaTypingTokenSets {
@@ -16,11 +16,11 @@ public final class JavaTypingTokenSets {
JavaTokenType.STRING_LITERAL, JavaTokenType.TEXT_BLOCK_LITERAL);
public static final TokenSet UNWANTED_TOKEN_BEFORE_QUESTION =
TokenSet.orSet(JavaBinaryOperations.ASSIGNMENT_OPS, TokenSet.create(JavaTokenType.QUEST, JavaTokenType.COLON));
TokenSet.orSet(ElementType.ASSIGNMENT_OPS, TokenSet.create(JavaTokenType.QUEST, JavaTokenType.COLON));
public static final TokenSet WANTED_TOKEN_BEFORE_QUESTION =
// Tokens that may appear before ?: in polyadic expression that may have non-boolean result
TokenSet.orSet(
TokenSet.create(JavaTokenType.OR, JavaTokenType.XOR, JavaTokenType.AND),
JavaBinaryOperations.SHIFT_OPS, JavaBinaryOperations.ADDITIVE_OPS, JavaBinaryOperations.MULTIPLICATIVE_OPS);
ElementType.SHIFT_OPS, ElementType.ADDITIVE_OPS, ElementType.MULTIPLICATIVE_OPS);
}
java/java-frontback-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
+3 -4
View File
@@ -6,7 +6,6 @@ import com.intellij.formatting.Spacing;
import com.intellij.lang.ASTNode;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.lang.java.JavaParserDefinition;
import com.intellij.lang.java.parser.JavaBinaryOperations;
import com.intellij.lexer.Lexer;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
@@ -1109,13 +1108,13 @@ public final class JavaSpacePropertyProcessor extends JavaElementVisitor {
else if (i == JavaTokenType.GT || i == JavaTokenType.LT || i == JavaTokenType.GE || i == JavaTokenType.LE) {
createSpaceInCode(mySettings.SPACE_AROUND_RELATIONAL_OPERATORS);
}
else if (JavaBinaryOperations.ADDITIVE_OPS.contains(i)) {
else if (ElementType.ADDITIVE_OPS.contains(i)) {
createSpaceInCode(mySettings.SPACE_AROUND_ADDITIVE_OPERATORS);
}
else if (JavaBinaryOperations.MULTIPLICATIVE_OPS.contains(i)) {
else if (ElementType.MULTIPLICATIVE_OPS.contains(i)) {
createSpaceInCode(mySettings.SPACE_AROUND_MULTIPLICATIVE_OPERATORS);
}
else if (JavaBinaryOperations.SHIFT_OPS.contains(i)) {
else if (ElementType.SHIFT_OPS.contains(i)) {
createSpaceInCode(mySettings.SPACE_AROUND_SHIFT_OPERATORS);
}
else {