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

greenify & cleanup around PsiBuilderImpl

Browse Source 
GitOrigin-RevId: 4f6c42bd5b46a075f3153b63e82e4754aca2c123
This commit is contained in:
peter
2019-07-03 18:50:15 +03:00
committed by intellij-monorepo-bot
parent e605ae44ed
commit 7472012b07
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
+10 -12
View File
@@ -38,9 +38,7 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.AbstractList;
import java.util.List;
import java.util.Objects;
import java.util.*;
import static com.intellij.lang.WhitespacesBinders.DEFAULT_RIGHT_BINDER;
@@ -119,11 +117,11 @@ public class PsiBuilderImpl extends UnprotectedUserDataHolder implements PsiBuil
null, chameleon);
}
public PsiBuilderImpl(@NotNull Project project,
@NotNull ParserDefinition parserDefinition,
@NotNull Lexer lexer,
@NotNull LighterLazyParseableNode chameleon,
@NotNull CharSequence text) {
PsiBuilderImpl(@NotNull Project project,
@NotNull ParserDefinition parserDefinition,
@NotNull Lexer lexer,
@NotNull LighterLazyParseableNode chameleon,
@NotNull CharSequence text) {
this(project, chameleon.getContainingFile(), parserDefinition, lexer,
chameleon.getCharTable(), text, null, null, ((LazyParseableToken)chameleon).myParentStructure, chameleon);
}
@@ -189,7 +187,7 @@ public class PsiBuilderImpl extends UnprotectedUserDataHolder implements PsiBuil
}
private static boolean doLexingOptimizationCorrectionCheck() {
return false; // set to true to check that re-lexing of lazy parseables produces the same sequence as cached one
return false; // set to true to check that re-lexing of chameleons produces the same sequence as cached one
}
@Override
@@ -360,12 +358,11 @@ public class PsiBuilderImpl extends UnprotectedUserDataHolder implements PsiBuil
public void addChild(@NotNull ProductionMarker node) {
if (myFirstChild == null) {
myFirstChild = node;
myLastChild = node;
}
else {
myLastChild.myNext = node;
myLastChild = node;
}
myLastChild = node;
}
@NotNull
@@ -638,6 +635,7 @@ public class PsiBuilderImpl extends UnprotectedUserDataHolder implements PsiBuil
myMessage = null;
}
@NotNull
@Override
public WhitespacesAndCommentsBinder getBinder(boolean done) {
assert !done;
@@ -1290,7 +1288,7 @@ public class PsiBuilderImpl extends UnprotectedUserDataHolder implements PsiBuil
final IElementType type = marker.myType;
if (type == TokenType.ERROR_ELEMENT) {
String error = marker.myBuilder.myOptionalData.getDoneError(marker.markerId);
return Factory.createErrorElement(error);
return Factory.createErrorElement(Objects.requireNonNull(error));
}
if (type == null) {
xml/xml-psi-impl/src/com/intellij/embedding/MasqueradingPsiBuilderAdapter.java
+1 -14
View File
@@ -16,7 +16,6 @@
package com.intellij.embedding;
import com.intellij.lang.ASTNode;
import com.intellij.lang.LighterLazyParseableNode;
import com.intellij.lang.ParserDefinition;
import com.intellij.lang.PsiBuilder;
import com.intellij.lang.impl.DelegateMarker;
@@ -55,19 +54,7 @@ public class MasqueradingPsiBuilderAdapter extends PsiBuilderAdapter {
@NotNull final MasqueradingLexer lexer,
@NotNull final ASTNode chameleon,
@NotNull final CharSequence text) {
this(new PsiBuilderImpl(project, parserDefinition, lexer, chameleon, text));
}
public MasqueradingPsiBuilderAdapter(@NotNull final Project project,
@NotNull final ParserDefinition parserDefinition,
@NotNull final MasqueradingLexer lexer,
@NotNull final LighterLazyParseableNode chameleon,
@NotNull final CharSequence text) {
this(new PsiBuilderImpl(project, parserDefinition, lexer, chameleon, text));
}
private MasqueradingPsiBuilderAdapter(PsiBuilderImpl builder) {
super(builder);
super(new PsiBuilderImpl(project, parserDefinition, lexer, chameleon, text));
LOG.assertTrue(myDelegate instanceof PsiBuilderImpl);
myBuilderDelegate = ((PsiBuilderImpl)myDelegate);