eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 21:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ASTNodeWrapper.highlightNode

Browse Source
This commit is contained in:
Jakub Valtar
2015-09-21 11:46:22 -04:00
parent 0efbb48e85
commit aa138107d9
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/processing/mode/java/pdex/ASTGenerator.java
View File

@@ -1752,7 +1752,7 @@ public class ASTGenerator {
//errorCheckerService.highlightNode(simpName2);
ASTNodeWrapper declWrap = new ASTNodeWrapper(simpName2, nodeLabel);
//errorCheckerService.highlightNode(declWrap);
if (!declWrap.highlightNode(this)) {
if (!declWrap.highlightNode(editor)) {
Messages.loge("Highlighting failed.");
}
}
@@ -1885,7 +1885,7 @@ public class ASTGenerator {
.getLastSelectedPathComponent();
if (tnode.getUserObject() instanceof ASTNodeWrapper) {
ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject();
awrap.highlightNode(thisASTGenerator);
awrap.highlightNode(editor);
// errorCheckerService.highlightNode(awrap);
//--
@@ -1984,7 +1984,7 @@ public class ASTGenerator {
if (tnode.getUserObject() instanceof ASTNodeWrapper) {
ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject();
//errorCheckerService.highlightNode(awrap);
awrap.highlightNode(thisASTGenerator);
awrap.highlightNode(editor);
}
}
};

20
java/src/processing/mode/java/pdex/ASTNodeWrapper.java
View File

@@ -46,6 +46,7 @@ import org.eclipse.jdt.core.dom.TypeDeclaration;
import processing.app.Base;
import processing.app.Messages;
import processing.mode.java.JavaEditor;
/**
@@ -541,21 +542,20 @@ public class ASTNodeWrapper {
/**
* Highlight the ASTNode in the editor, if it's of type
* SimpleName
* @param astGenerator
* @param editor
* @return - true if highlighting was successful
*/
public boolean highlightNode(ASTGenerator astGenerator){
if (!(Node instanceof SimpleName)) {
public boolean highlightNode(JavaEditor editor){
if (!(node instanceof SimpleName)) {
return false;
}
SimpleName nodeName = (SimpleName) node;
try {
//TODO: Redundant code. See ASTGenerator.getJavaSourceCodeline()
int javaLineNumber = getLineNumber(nodeName);
int pdeOffs[] = astGenerator.errorCheckerService
.calculateTabIndexAndLineNumber(javaLineNumber);
int pdeOffs[] = editor.getErrorChecker().calculateTabIndexAndLineNumber(javaLineNumber);
PlainDocument javaSource = new PlainDocument();
javaSource.insertString(0, astGenerator.errorCheckerService.sourceCode, null);
javaSource.insertString(0, editor.getErrorChecker().sourceCode, null);
Element lineElement = javaSource.getDefaultRootElement()
.getElement(javaLineNumber-1);
if(lineElement == null) {
@@ -566,8 +566,8 @@ public class ASTNodeWrapper {
String javaLine = javaSource.getText(lineElement.getStartOffset(),
lineElement.getEndOffset()
- lineElement.getStartOffset());
astGenerator.editor.getSketch().setCurrentCode(pdeOffs[0]);
String pdeLine = astGenerator.editor.getLineText(pdeOffs[1]);
editor.getSketch().setCurrentCode(pdeOffs[0]);
String pdeLine = editor.getLineText(pdeOffs[1]);
String lookingFor = nodeName.toString();
Messages.log(lookingFor + ", " + nodeName.getStartPosition());
Messages.log(javaLineNumber +" JL " + javaLine + " LSO " + lineElement.getStartOffset() + ","
@@ -587,9 +587,9 @@ public class ASTNodeWrapper {
"Please file a bug report.");
return false;
}
int lso = astGenerator.editor.getTextArea().getLineStartOffset(pdeOffs[1]);
int lso = editor.getTextArea().getLineStartOffset(pdeOffs[1]);
highlightStart += lso;
astGenerator.editor.setSelection(highlightStart, highlightStart
editor.setSelection(highlightStart, highlightStart
+ nodeName.getLength());
/*
// First find the name in the java line, and marks its index

4
java/src/processing/mode/java/pdex/SketchOutline.java
View File

@@ -157,7 +157,7 @@ public class SketchOutline {
.getLastSelectedPathComponent();
if (tnode.getUserObject() instanceof ASTNodeWrapper) {
ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject();
awrap.highlightNode(errorCheckerService.astGenerator);
awrap.highlightNode(editor);
//errorCheckerService.highlightNode(awrap);
close();
}
@@ -284,7 +284,7 @@ public class SketchOutline {
.getLastSelectedPathComponent();
if (tnode.getUserObject() instanceof ASTNodeWrapper) {
ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject();
awrap.highlightNode(errorCheckerService.astGenerator);
awrap.highlightNode(editor);
// log(awrap);
//errorCheckerService.highlightNode(awrap);
close();