eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-12 18:10:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ctrl+Click further fixes. Now works with multiple statements on a line.

Browse Source
This commit is contained in:
Manindra Moharana
2013-06-23 21:23:20 +05:30
parent 457a219db4
commit b29f91ed62
1 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
pdex/src/processing/mode/experimental/ASTGenerator.java
View File

@@ -1007,19 +1007,57 @@ public class ASTGenerator {
}
System.out.println("FLON: " + lineNumber);
ASTNode lineNode = findLineOfNode(compilationUnit, lineNumber, offset, name);
System.out.println("+> " + lineNode);
ASTNode decl = null;
if (lineNode != null) {
ASTNodeWrapper lineNodeWrap = new ASTNodeWrapper(lineNode);
int ret[][] = lineNodeWrap.getOffsetMapping(errorCheckerService);
int javaCodeMap[] = ret[0];
int javaCodeMap[] = ret[0], pdeCodeMap[] = ret[1];
int altOff = 0;
for (; altOff < javaCodeMap.length; altOff++) {
if(javaCodeMap[altOff] == offset)
if(javaCodeMap[altOff] == pdeCodeMap[offset]){
//altOff = javaCodeMap[altOff];
break;
}
}
System.out.println("FLON2: " + lineNumber + " LN spos "
+ lineNode.getStartPosition() + " off " + offset + " alt off" + altOff);
/*
* Now I need to see if multiple statements exist with this same line number
* If that's the case, I need to ensure the offset is right.
*/
ASTNode parLineNode = lineNode.getParent();
Iterator<StructuralPropertyDescriptor> it = parLineNode
.structuralPropertiesForType().iterator();
boolean flag = true;
int lineStartPos = lineNode.getStartPosition(), offAdjust = 0;
while (it.hasNext() && flag) {
StructuralPropertyDescriptor prop = (StructuralPropertyDescriptor) it
.next();
if (prop.isChildListProperty()) {
List<ASTNode> nodelist = (List<ASTNode>) parLineNode
.getStructuralProperty(prop);
for (ASTNode cnode : nodelist) {
if (getLineNumber(cnode) == lineNumber) {
if (cnode.getStartPosition() <= lineNode.getStartPosition()
+ altOff
&& cnode.getStartPosition() + cnode.getLength() > lineNode
.getStartPosition() + altOff) {
System.out.println(cnode);
offAdjust = cnode.getStartPosition() - lineNode.getStartPosition();
lineNode = cnode;
altOff -= offAdjust;
flag = false;
break;
}
}
}
}
}
System.out.println("FLON3 "+lineNode.getStartPosition() + " off " + offset + " alt off" + altOff);
ASTNode simpName = pinpointOnLine(lineNode, altOff,
lineNode.getStartPosition(), name);
System.out.println("+++> " + simpName);
@@ -1235,14 +1273,14 @@ public class ASTGenerator {
// System.out.println("Inside "+getNodeAsString(node) + " | " + root.getLineNumber(node.getStartPosition()));
if (root.getLineNumber(node.getStartPosition()) == lineNumber) {
System.err
.println(3 + getNodeAsString(node) + " len " + node.getLength());
if (offset < node.getLength())
return node;
else {
System.err.println(-11);
return null;
}
.println(3 + getNodeAsString(node) + " len " + node.getLength());
return node;
// if (offset < node.getLength())
// return node;
// else {
// System.err.println(-11);
// return null;
// }
}
for (Object oprop : node.structuralPropertiesForType()) {
StructuralPropertyDescriptor prop = (StructuralPropertyDescriptor) oprop;