MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

RelaxNg: Avoid NPEs to improve performance when calculating element descriptors

Browse Source 
GitOrigin-RevId: 9260e29679da728aeba7119accf2214b5dcfd460
This commit is contained in:
Piotr Tomiak
2024-09-24 10:41:57 +02:00
committed by intellij-monorepo-bot
parent 1a89d14b2a
commit 007db6c60e
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RecursionSaveWalker.java
View File

@@ -29,9 +29,11 @@ public class RecursionSaveWalker extends DPatternWalker {
@Override
public Void onGrammar(DGrammarPattern p) {
if (myVisited.add(p)) {
try {
return super.onGrammar(p);
} catch (NullPointerException e) {
var start = p.getStart();
if (start != null) {
return start.accept(this);
}
else {
return null; // missing start pattern
}
}
@@ -41,9 +43,11 @@ public class RecursionSaveWalker extends DPatternWalker {
@Override
public Void onRef(DRefPattern p) {
if (myVisited.add(p)) {
try {
return super.onRef(p);
} catch (NullPointerException e) {
var target = p.getTarget();
var pattern = target != null ? target.getPattern() : null;
if (pattern != null) {
return pattern.accept(this);
} else {
return null; // unresolved ref
}
}
@@ -53,9 +57,11 @@ public class RecursionSaveWalker extends DPatternWalker {
@Override
protected Void onUnary(DUnaryPattern p) {
if (myVisited.add(p)) {
try {
return super.onUnary(p);
} catch (NullPointerException e) {
var child = p.getChild();
if (child != null) {
child.accept(this);
}
else {
return null; // empty element
}
}