Skip to content

Use root node determined by Parser.parse(IDocument) in UpdateUnitVersions and TargetDefinitionCodeMiningProvider #2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use root node determined by Parser.parse(IDocument) in UpdateUnitVersions and TargetDefinitionCodeMiningProvider #2139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d946f5d
Use root node determined by Parser.parse(IDocument) in UpdateUnitVers…
trancexpress Nov 18, 2025
17301f0
Version bump(s) for 4.38 stream
eclipse-pde-bot Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.pde.genericeditor.extension;singleton:=true
Bundle-Version: 1.3.200.qualifier
Bundle-Version: 1.3.300.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface.text,
Expand Down
3 changes: 1 addition & 2 deletions ...nternal/genericeditor/target/extension/codemining/TargetDefinitionCodeMiningProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ void fillCodeMinings(IDocument document, List<ICodeMining> minings) throws BadLo
int line = 0;
try {
Parser parser = Parser.getDefault();
parser.parse(document);
Node target = parser.getRootNode();
Node target = parser.parse(document);
if (target != null) {
line = document.getLineOfOffset(target.getOffsetStart());
minings.add(new TargetDefinitionActivationCodeMining(line, document, this, null));
Expand Down
5 changes: 2 additions & 3 deletions ...c/org/eclipse/pde/internal/genericeditor/target/extension/command/UpdateUnitVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,12 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
return null;
}

Node rootNode = null;
Parser parser = Parser.getDefault();
try {
parser.parse(document);
rootNode = parser.parse(document);
} catch (XMLStreamException e) {
return null;
}
Node rootNode = parser.getRootNode();
if (rootNode == null) {
return null;
}
Expand Down
9 changes: 6 additions & 3 deletions ...tension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ private void initializeParser() {
inputFactory = XMLInputFactory.newInstance();
}

public void parse(IDocument document) throws XMLStreamException {
public Node parse(IDocument document) throws XMLStreamException {
target = null;
Node parsedTarget = null;
Node currentParent = null;
Node currentNode = null;
Iterator<XMLElement> tagReaderIterator = createXMLTagItterator(document.get());
Expand Down Expand Up @@ -81,8 +82,9 @@ public void parse(IDocument document) throws XMLStreamException {
containerLocation.addRepositoryLocation(locationValue);
}
} else if (ITargetConstants.TARGET_TAG.equalsIgnoreCase(name)) {
target = new Node();
currentNode = target;
parsedTarget = new Node();
target = parsedTarget;
currentNode = parsedTarget;
} else {
currentNode = new Node();
}
Expand All @@ -107,6 +109,7 @@ public void parse(IDocument document) throws XMLStreamException {
while (eventReader.hasNext()) {
eventReader.nextEvent();
}
return parsedTarget;
}

private Iterator<XMLElement> createXMLTagItterator(String document) {
Expand Down
Loading