Skip to content

Commit 8d24374

Browse files
committedJul 19, 2018
Add watcher on sketch files
Reloads sketch content if the Editor is not in foreground and isomething happens in the backing storage files. Note that no confirmation dialog is displayed (same behaviour as SublimeText, differs from other IDEs) Fixes #4551 and #5345
1 parent 473617f commit 8d24374

File tree

3 files changed

+256
-5
lines changed

3 files changed

+256
-5
lines changed
 

‎app/src/processing/app/Editor.java

+43-3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import processing.app.syntax.SketchTextArea;
4545
import processing.app.tools.MenuScroller;
4646
import processing.app.tools.Tool;
47+
import processing.app.tools.WatchDir;
4748

4849
import javax.swing.*;
4950
import javax.swing.event.*;
@@ -73,6 +74,13 @@
7374
import static processing.app.Theme.scale;
7475

7576
import processing.app.helpers.FileUtils;
77+
import static java.nio.file.StandardWatchEventKinds.*;
78+
import java.nio.file.WatchService;
79+
import java.nio.file.WatchKey;
80+
import java.nio.file.WatchEvent;
81+
import java.nio.file.FileSystems;
82+
import java.nio.file.Path;
83+
import java.io.File;
7684

7785
/**
7886
* Main editor panel for the Processing Development Environment.
@@ -88,6 +96,7 @@ public class Editor extends JFrame implements RunnerListener {
8896
private final Box upper;
8997
private ArrayList<EditorTab> tabs = new ArrayList<>();
9098
private int currentTabIndex = -1;
99+
private static boolean watcherDisable = false;
91100

92101
private static class ShouldSaveIfModified
93102
implements Predicate<SketchController> {
@@ -198,6 +207,8 @@ public boolean test(SketchController sketch) {
198207
private Runnable timeoutUploadHandler;
199208

200209
private Map<String, Tool> internalToolCache = new HashMap<String, Tool>();
210+
protected Thread watcher = null;
211+
protected Runnable task = null;
201212

202213
public Editor(Base ibase, File file, int[] storedLocation, int[] defaultLocation, Platform platform) throws Exception {
203214
super("Arduino");
@@ -223,12 +234,20 @@ public void windowClosing(WindowEvent e) {
223234
// When bringing a window to front, let the Base know
224235
addWindowListener(new WindowAdapter() {
225236
public void windowActivated(WindowEvent e) {
237+
if (watcher != null) {
238+
watcher.interrupt();
239+
watcher = null;
240+
}
226241
base.handleActivated(Editor.this);
227242
}
228243

229244
// added for 1.0.5
230245
// http://dev.processing.org/bugs/show_bug.cgi?id=1260
231246
public void windowDeactivated(WindowEvent e) {
247+
if (watcher == null) {
248+
watcher = new Thread(task);
249+
watcher.start();
250+
}
232251
fileMenu.remove(sketchbookMenu);
233252
fileMenu.remove(examplesMenu);
234253
List<Component> toolsMenuItemsToRemove = new LinkedList<>();
@@ -345,7 +364,6 @@ public void windowDeactivated(WindowEvent e) {
345364
EditorConsole.setCurrentEditorConsole(console);
346365
}
347366

348-
349367
/**
350368
* Handles files dragged & dropped from the desktop and into the editor
351369
* window. Dragging files into the editor window is the same as using
@@ -1688,7 +1706,7 @@ public void reorderTabs() {
16881706
* the given file.
16891707
* @throws IOException
16901708
*/
1691-
protected void addTab(SketchFile file, String contents) throws IOException {
1709+
public synchronized void addTab(SketchFile file, String contents) throws IOException {
16921710
EditorTab tab = new EditorTab(this, file, contents);
16931711
tab.getTextArea().getDocument()
16941712
.addDocumentListener(new DocumentTextChangeListener(
@@ -1697,9 +1715,12 @@ protected void addTab(SketchFile file, String contents) throws IOException {
16971715
reorderTabs();
16981716
}
16991717

1700-
protected void removeTab(SketchFile file) throws IOException {
1718+
public synchronized void removeTab(SketchFile file) throws IOException {
17011719
int index = findTabIndex(file);
17021720
tabs.remove(index);
1721+
if (index == currentTabIndex) {
1722+
currentTabIndex = currentTabIndex -1;
1723+
}
17031724
}
17041725

17051726
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -1966,6 +1987,25 @@ protected boolean handleOpenInternal(File sketchFile) {
19661987
// Disable untitled setting from previous document, if any
19671988
untitled = false;
19681989

1990+
if (watcherDisable == true) {
1991+
return true;
1992+
}
1993+
1994+
// Add FS watcher for current Editor instance
1995+
Path dir = file.toPath().getParent();
1996+
1997+
Editor instance = this;
1998+
1999+
task = new Runnable() {
2000+
public void run() {
2001+
try {
2002+
new WatchDir(dir, true).processEvents(instance);
2003+
} catch (IOException x) {
2004+
watcherDisable = true;
2005+
}
2006+
}
2007+
};
2008+
19692009
// opening was successful
19702010
return true;
19712011
}

‎app/src/processing/app/EditorTab.java

+15-2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@
5050
import javax.swing.text.DefaultCaret;
5151
import javax.swing.text.Document;
5252

53+
import static java.nio.file.StandardWatchEventKinds.*;
54+
import java.nio.file.WatchService;
55+
import java.nio.file.WatchKey;
56+
import java.nio.file.WatchEvent;
57+
import java.nio.file.FileSystems;
58+
import java.nio.file.Path;
59+
import java.io.File;
60+
5361
import org.apache.commons.lang3.StringUtils;
5462
import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
5563
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaEditorKit;
@@ -64,6 +72,7 @@
6472
import processing.app.syntax.SketchTextArea;
6573
import processing.app.syntax.SketchTextAreaEditorKit;
6674
import processing.app.tools.DiscourseFormat;
75+
import processing.app.tools.WatchDir;
6776

6877
/**
6978
* Single tab, editing a single file, in the main window.
@@ -110,7 +119,7 @@ public EditorTab(Editor editor, SketchFile file, String contents)
110119
file.setStorage(this);
111120
applyPreferences();
112121
add(scrollPane, BorderLayout.CENTER);
113-
textarea.addMouseWheelListener(this);
122+
textarea.addMouseWheelListener(this);
114123
}
115124

116125
private RSyntaxDocument createDocument(String contents) {
@@ -487,7 +496,11 @@ public void setSelection(int start, int stop) {
487496
public int getScrollPosition() {
488497
return scrollPane.getVerticalScrollBar().getValue();
489498
}
490-
499+
500+
public RTextScrollPane getScrollPane() {
501+
return scrollPane;
502+
}
503+
491504
public void setScrollPosition(int pos) {
492505
scrollPane.getVerticalScrollBar().setValue(pos);
493506
}
+198
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
/*
2+
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
3+
*
4+
* Redistribution and use in source and binary forms, with or without
5+
* modification, are permitted provided that the following conditions
6+
* are met:
7+
*
8+
* - Redistributions of source code must retain the above copyright
9+
* notice, this list of conditions and the following disclaimer.
10+
*
11+
* - Redistributions in binary form must reproduce the above copyright
12+
* notice, this list of conditions and the following disclaimer in the
13+
* documentation and/or other materials provided with the distribution.
14+
*
15+
* - Neither the name of Oracle nor the names of its
16+
* contributors may be used to endorse or promote products derived
17+
* from this software without specific prior written permission.
18+
*
19+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
20+
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
21+
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
23+
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24+
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25+
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
26+
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
27+
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
28+
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
29+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30+
*/
31+
32+
package processing.app.tools;
33+
34+
import java.nio.file.*;
35+
import static java.nio.file.StandardWatchEventKinds.*;
36+
import static java.nio.file.LinkOption.*;
37+
import java.nio.file.attribute.*;
38+
import java.io.*;
39+
import java.util.*;
40+
import processing.app.Editor;
41+
import processing.app.EditorTab;
42+
import processing.app.Sketch;
43+
import processing.app.SketchFile;
44+
import processing.app.helpers.FileUtils;
45+
46+
/**
47+
* Example to watch a directory (or tree) for changes to files.
48+
*/
49+
50+
public class WatchDir {
51+
52+
private final WatchService watcher;
53+
private final Map<WatchKey,Path> keys;
54+
private final boolean recursive;
55+
private boolean trace = false;
56+
57+
@SuppressWarnings("unchecked")
58+
static <T> WatchEvent<T> cast(WatchEvent<?> event) {
59+
return (WatchEvent<T>)event;
60+
}
61+
62+
/**
63+
* Register the given directory with the WatchService
64+
*/
65+
private void register(Path dir) throws IOException {
66+
WatchKey key = dir.register(watcher, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY);
67+
if (trace) {
68+
Path prev = keys.get(key);
69+
if (prev == null) {
70+
} else {
71+
if (!dir.equals(prev)) {
72+
}
73+
}
74+
}
75+
keys.put(key, dir);
76+
}
77+
78+
/**
79+
* Register the given directory, and all its sub-directories, with the
80+
* WatchService.
81+
*/
82+
private void registerAll(final Path start) throws IOException {
83+
// register directory and sub-directories
84+
Files.walkFileTree(start, new SimpleFileVisitor<Path>() {
85+
@Override
86+
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
87+
throws IOException
88+
{
89+
register(dir);
90+
return FileVisitResult.CONTINUE;
91+
}
92+
});
93+
}
94+
95+
/**
96+
* Creates a WatchService and registers the given directory
97+
*/
98+
public WatchDir(Path dir, boolean recursive) throws IOException {
99+
this.watcher = FileSystems.getDefault().newWatchService();
100+
this.keys = new HashMap<WatchKey,Path>();
101+
this.recursive = recursive;
102+
103+
if (recursive) {
104+
registerAll(dir);
105+
} else {
106+
register(dir);
107+
}
108+
109+
// enable trace after initial registration
110+
this.trace = true;
111+
}
112+
113+
/**
114+
* Process all events for keys queued to the watcher
115+
*/
116+
public void processEvents(Editor editor) {
117+
for (;;) {
118+
119+
// wait for key to be signalled
120+
WatchKey key;
121+
try {
122+
key = watcher.take();
123+
} catch (InterruptedException x) {
124+
return;
125+
}
126+
127+
Path dir = keys.get(key);
128+
if (dir == null) {
129+
continue;
130+
}
131+
132+
for (WatchEvent<?> event: key.pollEvents()) {
133+
WatchEvent.Kind kind = event.kind();
134+
135+
// TBD - provide example of how OVERFLOW event is handled
136+
if (kind == OVERFLOW) {
137+
continue;
138+
}
139+
140+
// Context for directory entry event is the file name of entry
141+
WatchEvent<Path> ev = cast(event);
142+
Path name = ev.context();
143+
Path child = dir.resolve(name);
144+
145+
// reload the tab content
146+
if (kind == ENTRY_CREATE) {
147+
try {
148+
String filename = name.toString();
149+
FileUtils.SplitFile split = FileUtils.splitFilename(filename);
150+
if (Sketch.EXTENSIONS.contains(split.extension.toLowerCase())) {
151+
SketchFile sketch = editor.getSketch().addFile(filename);
152+
editor.addTab(sketch, null);
153+
}
154+
} catch (Exception e) {
155+
return;
156+
}
157+
} else if (kind == ENTRY_DELETE) {
158+
try {
159+
Thread.sleep(100);
160+
int index = editor.getSketch().findFileIndex(child.toAbsolutePath().toFile());
161+
editor.removeTab(editor.getSketch().getFile(index));
162+
} catch (Exception e1) {
163+
// Totally fine, if the sleep gets interrupted it means that
164+
// the action was executed in the UI, not externally
165+
return;
166+
}
167+
}
168+
editor.getTabs().forEach(tab -> {
169+
if (!tab.isModified()) {
170+
tab.reload();
171+
}
172+
});
173+
// if directory is created, and watching recursively, then
174+
// register it and its sub-directories
175+
if (recursive && (kind == ENTRY_CREATE)) {
176+
try {
177+
if (Files.isDirectory(child, NOFOLLOW_LINKS)) {
178+
registerAll(child);
179+
}
180+
} catch (IOException x) {
181+
// ignore to keep sample readbale
182+
}
183+
}
184+
}
185+
186+
// reset key and remove from set if directory no longer accessible
187+
boolean valid = key.reset();
188+
if (!valid) {
189+
keys.remove(key);
190+
191+
// all directories are inaccessible
192+
if (keys.isEmpty()) {
193+
break;
194+
}
195+
}
196+
}
197+
}
198+
}

0 commit comments

Comments
 (0)
Failed to load comments.