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

[java] Don't replace identifier for implicit class constructors

Browse Source 
Such constructors are not valid. The class name is used to create the constructor name, but this name is not available here, resulting in an NPE. #IDEA-359731

GitOrigin-RevId: 4d7798045f820315a4ca5bd8a66e786c4da58976
This commit is contained in:
Bart van Helvert
2024-09-25 22:37:23 +02:00
committed by intellij-monorepo-bot
parent aeb62393d2
commit 941408d4c8
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java
View File

@@ -107,11 +107,15 @@ public class ClassElement extends CompositeElement implements Constants {
}
}
IElementType elementType = getElementType();
ASTNode afterLast = last.getTreeNext();
ASTNode next;
for (ASTNode child = first; child != afterLast; child = next) {
next = child.getTreeNext();
if (child.getElementType() == JavaElementType.METHOD && ((PsiMethod)SourceTreeToPsiMap.treeElementToPsi(child)).isConstructor()) {
if (child.getElementType() == JavaElementType.METHOD
&& ((PsiMethod)SourceTreeToPsiMap.treeElementToPsi(child)).isConstructor()
&& elementType != IMPLICIT_CLASS && elementType != ANONYMOUS_CLASS // can't declare constructor, code has errors
) {
ASTNode oldIdentifier = ((CompositeElement)child).findChildByRole(ChildRole.NAME);
ASTNode newIdentifier = findChildByRole(ChildRole.NAME).copyElement();
newIdentifier.putUserData(CharTable.CHAR_TABLE_KEY, SharedImplUtil.findCharTableByTree(this));
@@ -156,9 +160,9 @@ public class ClassElement extends CompositeElement implements Constants {
if (firstAdded.getElementType() == ENUM_CONSTANT) {
final CharTable treeCharTab = SharedImplUtil.findCharTableByTree(this);
for (ASTNode child = ((ASTNode)first).getTreeNext(); child != null; child = child.getTreeNext()) {
final IElementType elementType = child.getElementType();
if (elementType == COMMA || elementType == SEMICOLON) break;
if (elementType == ENUM_CONSTANT) {
final IElementType childElementType = child.getElementType();
if (childElementType == COMMA || childElementType == SEMICOLON) break;
if (childElementType == ENUM_CONSTANT) {
TreeElement comma = Factory.createSingleLeafElement(COMMA, ",", 0, 1, treeCharTab, getManager());
super.addInternal(comma, comma, first, Boolean.FALSE);
break;
@@ -166,9 +170,9 @@ public class ClassElement extends CompositeElement implements Constants {
}
for (ASTNode child = ((ASTNode)first).getTreePrev(); child != null; child = child.getTreePrev()) {
final IElementType elementType = child.getElementType();
if (elementType == COMMA || elementType == SEMICOLON) break;
if (elementType == ENUM_CONSTANT) {
final IElementType childElementType = child.getElementType();
if (childElementType == COMMA || childElementType == SEMICOLON) break;
if (childElementType == ENUM_CONSTANT) {
TreeElement comma = Factory.createSingleLeafElement(COMMA, ",", 0, 1, treeCharTab, getManager());
super.addInternal(comma, comma, child, Boolean.FALSE);
break;