projects
/
app.Builder.js
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/Builder4/Editor.bjs
[app.Builder.js]
/
src
/
Builder4
/
Editor.vala
diff --git
a/src/Builder4/Editor.vala
b/src/Builder4/Editor.vala
index
7c47c65
..
3b4d09b
100644
(file)
--- a/
src/Builder4/Editor.vala
+++ b/
src/Builder4/Editor.vala
@@
-168,7
+168,7
@@
public class Editor : Object
}
}
- public void forwardSearch () {
+ public void forwardSearch (
bool change_focus
) {
if (this.searchcontext == null) {
return;
if (this.searchcontext == null) {
return;
@@
-177,13
+177,17
@@
public class Editor : Object
Gtk.TextIter beg, st,en;
this.buffer.el.get_iter_at_offset(out beg, this.last_search_end);
Gtk.TextIter beg, st,en;
this.buffer.el.get_iter_at_offset(out beg, this.last_search_end);
- this.searchcontext.forward(beg, out st, out en);
- this.last_search_end = en.get_offset();
-
- this.view.el.grab_focus();
- this.buffer.el.place_cursor(st);
-
+ if (!this.searchcontext.forward(beg, out st, out en)) {
+ this.last_search_end = 0;
+ } else {
+ this.last_search_end = en.get_offset();
+ if (change_focus) {
+ this.view.el.grab_focus();
+ }
+ this.buffer.el.place_cursor(st);
+ this.view.el.scroll_to_iter(st, 0.1f, true, 0.0f, 0.5f);
+ }
}
public class Xcls_Box2 : Object
}
public class Xcls_Box2 : Object
@@
-330,10
+334,13
@@
public class Editor : Object
var description = Pango.FontDescription.from_string("monospace");
description.set_size(8000);
var description = Pango.FontDescription.from_string("monospace");
description.set_size(8000);
+
this.el.override_font(description);
this.el.override_font(description);
+
+ try {
+ this.el.completion.add_provider(new Palete.CompletionProvider(_this));
+ } catch (GLib.Error e) {}
-
- this.el.completion.add_provider(new Palete.CompletionProvider(_this));
this.el.completion.unblock_interactive();
this.el.completion.select_on_show = true; // select
this.el.completion.show_headers = false;
this.el.completion.unblock_interactive();
this.el.completion.select_on_show = true; // select
this.el.completion.show_headers = false;
@@
-543,7
+550,7
@@
public class Editor : Object
// assume it's gtk...
this.check_running = true;
// assume it's gtk...
this.check_running = true;
-
+
if (!_this.window.windowstate.valasource.checkPlainFileSpawn(
_this.file,
str
if (!_this.window.windowstate.valasource.checkPlainFileSpawn(
_this.file,
str
@@
-567,13
+574,17
@@
public class Editor : Object
if (_this.file.language == "js") {
this.check_running = false;
print("calling validate javascript\n");
if (_this.file.language == "js") {
this.check_running = false;
print("calling validate javascript\n");
- return this.highlightErrors(p.validateJavascript(
+ Gee.HashMap<int,string> errors;
+ p.javascriptHasErrors(
+ _this.window.windowstate,
str,
_this.key,
_this.ptype,
_this.file,
str,
_this.key,
_this.ptype,
_this.file,
- _this.node
- ));
+
+ out errors
+ );
+ return this.highlightErrors(errors);
}
}