[gnome-builder] vala-pack: use ide_g_file_walk_with_ignore()
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] vala-pack: use ide_g_file_walk_with_ignore()
- Date: Fri, 26 Apr 2019 05:32:12 +0000 (UTC)
commit 7ddbe00ea4060bf82f5835db40167ec1932e0c4f
Author: Christian Hergert <chergert redhat com>
Date: Thu Apr 25 22:29:54 2019 -0700
vala-pack: use ide_g_file_walk_with_ignore()
.../vala-pack/lang-server/ide-vala-index.vala | 42 ++++++++++------------
1 file changed, 19 insertions(+), 23 deletions(-)
---
diff --git a/src/plugins/vala-pack/lang-server/ide-vala-index.vala
b/src/plugins/vala-pack/lang-server/ide-vala-index.vala
index e5db68477..9b148119f 100644
--- a/src/plugins/vala-pack/lang-server/ide-vala-index.vala
+++ b/src/plugins/vala-pack/lang-server/ide-vala-index.vala
@@ -313,32 +313,28 @@ namespace Ide
return symbol;
}
- private void load_directory (GLib.File directory,
- GLib.Cancellable? cancellable = null)
+ private void load_directory_walk_cb (GLib.File directory,
+ GLib.GenericArray<GLib.FileInfo> file_infos)
{
- try {
- var enumerator = directory.enumerate_children
(FileAttribute.STANDARD_NAME+","+FileAttribute.STANDARD_TYPE, 0, cancellable);
-
- FileInfo file_info;
- while ((file_info = enumerator.next_file ()) != null) {
- var name = file_info.get_name ();
-
- if (name == ".flatpak-builder" || name == ".git")
- continue;
-
- if (file_info.get_file_type () == GLib.FileType.DIRECTORY) {
- var child = directory.get_child (file_info.get_name ());
- load_directory (child, cancellable);
- } else if (name.has_suffix (".vala") || name.has_suffix (".vapi") ||
name.has_suffix (".gs") || name.has_suffix (".c")) {
- var child = directory.get_child (file_info.get_name ());
- code_context.add_source (child.get_path ());
- }
- }
+ for (var i = 0; i < file_infos.length; i++)
+ {
+ var name = file_infos[i].get_name ();
- enumerator.close ();
- } catch (GLib.Error err) {
- warning (err.message);
+ if (name != null && name.has_suffix (".vala")) {
+ var child = directory.get_child (name);
+ code_context.add_source (child.peek_path ());
+ }
}
}
+
+ private void load_directory (GLib.File directory,
+ GLib.Cancellable? cancellable = null)
+ {
+ Ide.g_file_walk_with_ignore (directory,
+ FileAttribute.STANDARD_NAME,
+ ".noindex",
+ cancellable,
+ load_directory_walk_cb);
+ }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]