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

PDEX + PPS: make rename and undo work together

Browse Source
This commit is contained in:
Jakub Valtar
2016-05-06 19:38:54 +02:00
parent 0e035b09e4
commit 8bc5fd2427
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
java/src/processing/mode/java/pdex/PDEX.java
View File

@@ -51,14 +51,16 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
import javax.swing.JTree;
import javax.swing.text.BadLocationException;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeModel;
import processing.app.Messages;
import processing.app.Preferences;
import processing.app.Sketch;
import processing.app.SketchCode;
import processing.app.syntax.SyntaxDocument;
import processing.app.ui.EditorStatus;
import processing.app.ui.Toolkit;
import processing.mode.java.JavaEditor;
@@ -657,7 +659,9 @@ public class PDEX {
final int currentOffset = editor.getCaretOffset();
mappedNodes.entrySet().forEach(entry -> {
int tabIndex = entry.getKey();
sketch.setCurrentCode(tabIndex);
SketchCode sketchCode = sketch.getCode(tabIndex);
SyntaxDocument document = (SyntaxDocument) sketchCode.getDocument();
List<SketchInterval> nodes = entry.getValue();
nodes.stream()
@@ -665,16 +669,23 @@ public class PDEX {
.sorted(Comparator.comparing((SketchInterval si) -> si.startTabOffset).reversed())
.forEach(si -> {
// Make sure offsets are in bounds
int length = editor.getTextArea().getDocumentLength();
if (si.startTabOffset >= 0 && si.startTabOffset <= length &&
si.stopTabOffset >= 0 && si.stopTabOffset <= length) {
int documentLength = document.getLength();
if (si.startTabOffset >= 0 && si.startTabOffset <= documentLength &&
si.stopTabOffset >= 0 && si.stopTabOffset <= documentLength) {
// Replace the code
editor.getTextArea().select(si.startTabOffset, si.stopTabOffset);
editor.getTextArea().setSelectedText(newName);
int length = si.stopTabOffset - si.startTabOffset;
try {
document.remove(si.startTabOffset, length);
document.insertString(si.startTabOffset, newName, null);
} catch (BadLocationException e) { /* Whatever */ }
}
});
sketch.setModified(true);
try {
sketchCode.setProgram(document.getText(0, document.getLength()));
} catch (BadLocationException e) { /* Whatever */ }
sketchCode.setModified(true);
editor.repaintHeader();
});
int precedingIntervals =

12
java/src/processing/mode/java/pdex/PreprocessingService.java
View File

@@ -261,14 +261,10 @@ public class PreprocessingService {
for (SketchCode sc : sketch.getCode()) {
if (sc.isExtension("pde")) {
tabStartsList.append(workBuffer.length());
if (sketch.getCurrentCode().equals(sc)) {
try {
workBuffer.append(sc.getDocumentText());
} catch (BadLocationException e) {
e.printStackTrace();
}
} else {
workBuffer.append(sc.getProgram());
try {
workBuffer.append(sc.getDocumentText());
} catch (BadLocationException e) {
e.printStackTrace();
}
workBuffer.append('\n');
}