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

AbstractJavaBlock: extracted utility functions into separate class

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2014-12-02 15:47:26 +02:00
parent fa96506cf9
commit 20fd2154b4
2 changed files with 95 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
View File

@@ -47,6 +47,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
import static com.intellij.psi.formatter.java.JavaFormatterUtil.getWrapType;
import static com.intellij.psi.formatter.java.MultipleFieldDeclarationHelper.*;
public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlock, ReservedWrapsProvider {
@@ -617,55 +618,6 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
}
}
/**
* Serves for processing composite field definitions as a single formatting block.
* <p/>
* <code>'Composite field definition'</code> looks like {@code 'int i1, i2 = 2'}. It produces two nodes of type
* {@link JavaElementType#FIELD} - {@code 'int i1'} and {@code 'i2 = 2'}. This method returns the second node if the first one
* is given (the given node is returned for <code>'single'</code> fields).
*
* @param child child field node to check
* @return last child field node at the field group identified by the given node if any; given child otherwise
*/
@NotNull
private static ASTNode findLastFieldInGroup(@NotNull final ASTNode child) {
PsiElement psi = child.getPsi();
if (psi == null) {
return child;
}
final PsiTypeElement typeElement = ((PsiVariable)psi).getTypeElement();
if (typeElement == null) return child;
ASTNode lastChildNode = child.getLastChildNode();
if (lastChildNode == null) return child;
if (lastChildNode.getElementType() == JavaTokenType.SEMICOLON) return child;
ASTNode currentResult = child;
ASTNode currentNode = child.getTreeNext();
while (currentNode != null) {
if (currentNode.getElementType() == TokenType.WHITE_SPACE
|| currentNode.getElementType() == JavaTokenType.COMMA
|| StdTokenSets.COMMENT_BIT_SET.contains(currentNode.getElementType())) {
}
else if (currentNode.getElementType() == JavaElementType.FIELD) {
if (compoundFieldPart(currentNode)) {
currentResult = currentNode;
}
else {
return currentResult;
}
}
else {
return currentResult;
}
currentNode = currentNode.getTreeNext();
}
return currentResult;
}
@Nullable
private ASTNode processTernaryOperationRange(@NotNull final List<Block> result,
@NotNull final ASTNode child,
@@ -1277,23 +1229,6 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
|| compoundFieldPart(node));
}
/**
* @return <code>true</code> if given node is a non-first part of composite field definition; <code>false</code> otherwise
*/
protected static boolean compoundFieldPart(@NotNull ASTNode node) {
if (node.getElementType() != JavaElementType.FIELD) {
return false;
}
ASTNode firstChild = node.getFirstChildNode();
if (firstChild == null || firstChild.getElementType() != JavaTokenType.IDENTIFIER) {
return false;
}
ASTNode prev = node.getTreePrev();
return prev == null || !JavaJspElementType.WHITE_SPACE_BIT_SET.contains(prev.getElementType())
|| StringUtil.countNewLines(prev.getChars()) <= 1;
}
@NotNull
public SyntheticCodeBlock createCodeBlockBlock(final List<Block> localResult, final Indent indent, final int childrenIndent) {
final SyntheticCodeBlock result = new SyntheticCodeBlock(localResult, null, getSettings(), myJavaSettings, indent, null);

94
java/java-impl/src/com/intellij/psi/formatter/java/MultipleFieldDeclarationHelper.java Normal file
View File

@@ -0,0 +1,94 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.psi.formatter.java;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.tree.JavaElementType;
import com.intellij.psi.impl.source.tree.JavaJspElementType;
import com.intellij.psi.impl.source.tree.StdTokenSets;
import org.jetbrains.annotations.NotNull;
public class MultipleFieldDeclarationHelper {
/**
* @return <code>true</code> if given node is a non-first part of composite field definition; <code>false</code> otherwise
*/
public static boolean compoundFieldPart(@NotNull ASTNode node) {
if (node.getElementType() != JavaElementType.FIELD) {
return false;
}
ASTNode firstChild = node.getFirstChildNode();
if (firstChild == null || firstChild.getElementType() != JavaTokenType.IDENTIFIER) {
return false;
}
ASTNode prev = node.getTreePrev();
return prev == null || !JavaJspElementType.WHITE_SPACE_BIT_SET.contains(prev.getElementType())
|| StringUtil.countNewLines(prev.getChars()) <= 1;
}
/**
* Serves for processing composite field definitions as a single formatting block.
* <p/>
* <code>'Composite field definition'</code> looks like {@code 'int i1, i2 = 2'}. It produces two nodes of type
* {@link JavaElementType#FIELD} - {@code 'int i1'} and {@code 'i2 = 2'}. This method returns the second node if the first one
* is given (the given node is returned for <code>'single'</code> fields).
*
* @param child child field node to check
* @return last child field node at the field group identified by the given node if any; given child otherwise
*/
@NotNull
public static ASTNode findLastFieldInGroup(@NotNull final ASTNode child) {
PsiElement psi = child.getPsi();
if (psi == null) {
return child;
}
final PsiTypeElement typeElement = ((PsiVariable)psi).getTypeElement();
if (typeElement == null) return child;
ASTNode lastChildNode = child.getLastChildNode();
if (lastChildNode == null) return child;
if (lastChildNode.getElementType() == JavaTokenType.SEMICOLON) return child;
ASTNode currentResult = child;
ASTNode currentNode = child.getTreeNext();
while (currentNode != null) {
if (currentNode.getElementType() == TokenType.WHITE_SPACE
|| currentNode.getElementType() == JavaTokenType.COMMA
|| StdTokenSets.COMMENT_BIT_SET.contains(currentNode.getElementType())) {
}
else if (currentNode.getElementType() == JavaElementType.FIELD) {
if (compoundFieldPart(currentNode)) {
currentResult = currentNode;
}
else {
return currentResult;
}
}
else {
return currentResult;
}
currentNode = currentNode.getTreeNext();
}
return currentResult;
}
}