[gnome-builder] build: move completion into new subdir

From: Christian Hergert <chergert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-builder] build: move completion into new subdir
Date: Wed, 2 May 2018 22:43:33 +0000 (UTC)
commit 59de8710a93b2185925d59967d7e1860190773e9
Author: Christian Hergert <chergert redhat com>
Date:   Wed May 2 15:43:49 2018 -0700

    build: move completion into new subdir
    
    As we start landing the new completion engine, it will be nice to have
    the ability to keep it separate from the sourceview subdir as it will grow
    in size a bit.

 src/libide/buffers/ide-buffer-manager.c            |  2 +-
 .../ide-completion-item.c                          |  2 +-
 .../ide-completion-item.h                          |  0
 .../ide-completion-provider.c                      |  2 +-
 .../ide-completion-provider.h                      |  0
 .../ide-completion-results.c                       |  2 +-
 .../ide-completion-results.h                       |  2 +-
 .../ide-completion-words.c                         |  4 +--
 .../ide-completion-words.h                         |  0
 .../ide-word-completion-item.c                     |  2 +-
 .../ide-word-completion-item.h                     |  2 +-
 .../ide-word-completion-provider.c                 |  8 +++---
 .../ide-word-completion-provider.h                 |  0
 .../ide-word-completion-results.c                  |  4 +--
 .../ide-word-completion-results.h                  |  2 +-
 src/libide/completion/meson.build                  | 29 ++++++++++++++++++++++
 src/libide/ide.h                                   |  6 ++---
 .../langserv/ide-langserv-completion-provider.h    |  2 +-
 src/libide/meson.build                             |  1 +
 .../ide-source-snippet-completion-provider.c       |  2 +-
 src/libide/sourceview/ide-source-view.c            |  4 +--
 src/libide/sourceview/meson.build                  | 14 -----------
 22 files changed, 53 insertions(+), 37 deletions(-)
---
diff --git a/src/libide/buffers/ide-buffer-manager.c b/src/libide/buffers/ide-buffer-manager.c
index 274a178c4..cf48d628b 100644
--- a/src/libide/buffers/ide-buffer-manager.c
+++ b/src/libide/buffers/ide-buffer-manager.c
@@ -33,6 +33,7 @@
 #include "buffers/ide-buffer.h"
 #include "buffers/ide-buffer-private.h"
 #include "buffers/ide-unsaved-files.h"
+#include "completion/ide-completion-words.h"
 #include "diagnostics/ide-diagnostics-manager.h"
 #include "diagnostics/ide-source-location.h"
 #include "diagnostics/ide-source-range.h"
@@ -40,7 +41,6 @@
 #include "files/ide-file.h"
 #include "projects/ide-project-edit.h"
 #include "projects/ide-project-edit-private.h"
-#include "sourceview/ide-completion-words.h"
 #include "vcs/ide-vcs.h"
 #include "threading/ide-task.h"
 #include "util/ide-doc-seq.h"
diff --git a/src/libide/sourceview/ide-completion-item.c b/src/libide/completion/ide-completion-item.c
similarity index 99%
rename from src/libide/sourceview/ide-completion-item.c
rename to src/libide/completion/ide-completion-item.c
index 7837648d1..e96739af8 100644
--- a/src/libide/sourceview/ide-completion-item.c
+++ b/src/libide/completion/ide-completion-item.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "sourceview/ide-completion-item.h"
+#include "completion/ide-completion-item.h"
 
 G_DEFINE_ABSTRACT_TYPE (IdeCompletionItem, ide_completion_item, G_TYPE_OBJECT)
 
diff --git a/src/libide/sourceview/ide-completion-item.h b/src/libide/completion/ide-completion-item.h
similarity index 100%
rename from src/libide/sourceview/ide-completion-item.h
rename to src/libide/completion/ide-completion-item.h
diff --git a/src/libide/sourceview/ide-completion-provider.c b/src/libide/completion/ide-completion-provider.c
similarity index 98%
rename from src/libide/sourceview/ide-completion-provider.c
rename to src/libide/completion/ide-completion-provider.c
index 94b583e40..95eaa622f 100644
--- a/src/libide/sourceview/ide-completion-provider.c
+++ b/src/libide/completion/ide-completion-provider.c
@@ -22,7 +22,7 @@
 
 #include "ide-context.h"
 
-#include "sourceview/ide-completion-provider.h"
+#include "completion/ide-completion-provider.h"
 #include "sourceview/ide-text-iter.h"
 
 G_DEFINE_INTERFACE (IdeCompletionProvider, ide_completion_provider, GTK_SOURCE_TYPE_COMPLETION_PROVIDER)
diff --git a/src/libide/sourceview/ide-completion-provider.h b/src/libide/completion/ide-completion-provider.h
similarity index 100%
rename from src/libide/sourceview/ide-completion-provider.h
rename to src/libide/completion/ide-completion-provider.h
diff --git a/src/libide/sourceview/ide-completion-results.c b/src/libide/completion/ide-completion-results.c
similarity index 99%
rename from src/libide/sourceview/ide-completion-results.c
rename to src/libide/completion/ide-completion-results.c
index ec3a26af0..74934d2a3 100644
--- a/src/libide/sourceview/ide-completion-results.c
+++ b/src/libide/completion/ide-completion-results.c
@@ -25,7 +25,7 @@
 
 #include "ide-debug.h"
 
-#include "sourceview/ide-completion-results.h"
+#include "completion/ide-completion-results.h"
 #include "util/ide-list-inline.h"
 
 typedef struct
diff --git a/src/libide/sourceview/ide-completion-results.h b/src/libide/completion/ide-completion-results.h
similarity index 98%
rename from src/libide/sourceview/ide-completion-results.h
rename to src/libide/completion/ide-completion-results.h
index 8ebb41905..f0a171785 100644
--- a/src/libide/sourceview/ide-completion-results.h
+++ b/src/libide/completion/ide-completion-results.h
@@ -22,7 +22,7 @@
 
 #include "ide-version-macros.h"
 
-#include "sourceview/ide-completion-item.h"
+#include "completion/ide-completion-item.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/libide/sourceview/ide-completion-words.c b/src/libide/completion/ide-completion-words.c
similarity index 96%
rename from src/libide/sourceview/ide-completion-words.c
rename to src/libide/completion/ide-completion-words.c
index 59e9f7404..2ff05e669 100644
--- a/src/libide/sourceview/ide-completion-words.c
+++ b/src/libide/completion/ide-completion-words.c
@@ -20,8 +20,8 @@
 
 #include "config.h"
 
-#include "sourceview/ide-completion-provider.h"
-#include "sourceview/ide-completion-words.h"
+#include "completion/ide-completion-provider.h"
+#include "completion/ide-completion-words.h"
 
 struct _IdeCompletionWords
 {
diff --git a/src/libide/sourceview/ide-completion-words.h b/src/libide/completion/ide-completion-words.h
similarity index 100%
rename from src/libide/sourceview/ide-completion-words.h
rename to src/libide/completion/ide-completion-words.h
diff --git a/src/libide/sourceview/ide-word-completion-item.c 
b/src/libide/completion/ide-word-completion-item.c
similarity index 98%
rename from src/libide/sourceview/ide-word-completion-item.c
rename to src/libide/completion/ide-word-completion-item.c
index dc9810ca5..1822d5fff 100644
--- a/src/libide/sourceview/ide-word-completion-item.c
+++ b/src/libide/completion/ide-word-completion-item.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "sourceview/ide-word-completion-item.h"
+#include "completion/ide-word-completion-item.h"
 
 typedef struct
 {
diff --git a/src/libide/sourceview/ide-word-completion-item.h 
b/src/libide/completion/ide-word-completion-item.h
similarity index 97%
rename from src/libide/sourceview/ide-word-completion-item.h
rename to src/libide/completion/ide-word-completion-item.h
index a0feab2dc..38145534c 100644
--- a/src/libide/sourceview/ide-word-completion-item.h
+++ b/src/libide/completion/ide-word-completion-item.h
@@ -20,7 +20,7 @@
 
 #include <gtksourceview/gtksource.h>
 
-#include "sourceview/ide-completion-item.h"
+#include "completion/ide-completion-item.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/libide/sourceview/ide-word-completion-provider.c 
b/src/libide/completion/ide-word-completion-provider.c
similarity index 99%
rename from src/libide/sourceview/ide-word-completion-provider.c
rename to src/libide/completion/ide-word-completion-provider.c
index 86dcf5d54..f95ec5a51 100644
--- a/src/libide/sourceview/ide-word-completion-provider.c
+++ b/src/libide/completion/ide-word-completion-provider.c
@@ -26,10 +26,10 @@
 
 #include "ide-debug.h"
 
-#include "sourceview/ide-word-completion-provider.h"
-#include "sourceview/ide-word-completion-item.h"
-#include "sourceview/ide-word-completion-results.h"
-#include "sourceview/ide-completion-provider.h"
+#include "completion/ide-completion-provider.h"
+#include "completion/ide-word-completion-provider.h"
+#include "completion/ide-word-completion-item.h"
+#include "completion/ide-word-completion-results.h"
 
 typedef struct
 {
diff --git a/src/libide/sourceview/ide-word-completion-provider.h 
b/src/libide/completion/ide-word-completion-provider.h
similarity index 100%
rename from src/libide/sourceview/ide-word-completion-provider.h
rename to src/libide/completion/ide-word-completion-provider.h
diff --git a/src/libide/sourceview/ide-word-completion-results.c 
b/src/libide/completion/ide-word-completion-results.c
similarity index 98%
rename from src/libide/sourceview/ide-word-completion-results.c
rename to src/libide/completion/ide-word-completion-results.c
index 847ea5c1c..3d605518d 100644
--- a/src/libide/sourceview/ide-word-completion-results.c
+++ b/src/libide/completion/ide-word-completion-results.c
@@ -20,8 +20,8 @@
 
 #include "config.h"
 
-#include "sourceview/ide-word-completion-results.h"
-#include "sourceview/ide-word-completion-item.h"
+#include "completion/ide-word-completion-results.h"
+#include "completion/ide-word-completion-item.h"
 
 struct _IdeWordCompletionResults
 {
diff --git a/src/libide/sourceview/ide-word-completion-results.h 
b/src/libide/completion/ide-word-completion-results.h
similarity index 96%
rename from src/libide/sourceview/ide-word-completion-results.h
rename to src/libide/completion/ide-word-completion-results.h
index b08494257..010763484 100644
--- a/src/libide/sourceview/ide-word-completion-results.h
+++ b/src/libide/completion/ide-word-completion-results.h
@@ -20,7 +20,7 @@
 
 #include <gtksourceview/gtksource.h>
 
-#include "sourceview/ide-completion-results.h"
+#include "completion/ide-completion-results.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/libide/completion/meson.build b/src/libide/completion/meson.build
new file mode 100644
index 000000000..4489dc622
--- /dev/null
+++ b/src/libide/completion/meson.build
@@ -0,0 +1,29 @@
+completion_headers = [
+  'ide-completion-item.h',
+  'ide-completion-provider.h',
+  'ide-completion-results.h',
+]
+
+completion_sources = [
+  'ide-completion-item.c',
+  'ide-completion-provider.c',
+  'ide-completion-results.c',
+]
+
+completion_private_sources = [
+  'ide-completion-words.c',
+  'ide-completion-words.h',
+  'ide-word-completion-item.c',
+  'ide-word-completion-item.h',
+  'ide-word-completion-provider.c',
+  'ide-word-completion-provider.h',
+  'ide-word-completion-results.c',
+  'ide-word-completion-results.h',
+]
+
+
+libide_public_headers += files(completion_headers)
+libide_public_sources += files(completion_sources)
+libide_private_sources += files(completion_private_sources)
+
+install_headers(completion_headers, subdir: join_paths(libide_header_subdir, 'completion'))
diff --git a/src/libide/ide.h b/src/libide/ide.h
index 4e27aeb8f..12f8ff00c 100644
--- a/src/libide/ide.h
+++ b/src/libide/ide.h
@@ -62,6 +62,9 @@ G_BEGIN_DECLS
 #include "buildsystem/ide-environment-variable.h"
 #include "buildsystem/ide-environment.h"
 #include "buildsystem/ide-simple-build-target.h"
+#include "completion/ide-completion-item.h"
+#include "completion/ide-completion-provider.h"
+#include "completion/ide-completion-results.h"
 #include "config/ide-configuration.h"
 #include "config/ide-configuration-manager.h"
 #include "config/ide-configuration-provider.h"
@@ -155,9 +158,6 @@ G_BEGIN_DECLS
 #include "snippets/ide-source-snippet.h"
 #include "snippets/ide-source-snippets-manager.h"
 #include "snippets/ide-source-snippets.h"
-#include "sourceview/ide-completion-item.h"
-#include "sourceview/ide-completion-provider.h"
-#include "sourceview/ide-completion-results.h"
 #include "sourceview/ide-indenter.h"
 #include "sourceview/ide-language.h"
 #include "sourceview/ide-source-map.h"
diff --git a/src/libide/langserv/ide-langserv-completion-provider.h 
b/src/libide/langserv/ide-langserv-completion-provider.h
index 977ec015b..b88e94e94 100644
--- a/src/libide/langserv/ide-langserv-completion-provider.h
+++ b/src/libide/langserv/ide-langserv-completion-provider.h
@@ -22,8 +22,8 @@
 
 #include "ide-object.h"
 
+#include "completion/ide-completion-provider.h"
 #include "langserv/ide-langserv-client.h"
-#include "sourceview/ide-completion-provider.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/libide/meson.build b/src/libide/meson.build
index 7ddc0f37f..8675a7566 100644
--- a/src/libide/meson.build
+++ b/src/libide/meson.build
@@ -55,6 +55,7 @@ subdir('buildconfig')
 subdir('buildui')
 subdir('buildsystem')
 subdir('buffers')
+subdir('completion')
 subdir('config')
 subdir('debugger')
 subdir('devices')
diff --git a/src/libide/snippets/ide-source-snippet-completion-provider.c 
b/src/libide/snippets/ide-source-snippet-completion-provider.c
index 2f7115b36..f91204266 100644
--- a/src/libide/snippets/ide-source-snippet-completion-provider.c
+++ b/src/libide/snippets/ide-source-snippet-completion-provider.c
@@ -19,9 +19,9 @@
 #include <glib/gi18n.h>
 #include <gtksourceview/gtksource.h>
 
+#include "completion/ide-completion-provider.h"
 #include "snippets/ide-source-snippet-completion-item.h"
 #include "snippets/ide-source-snippet-completion-provider.h"
-#include "sourceview/ide-completion-provider.h"
 
 struct _IdeSourceSnippetCompletionProvider
 {
diff --git a/src/libide/sourceview/ide-source-view.c b/src/libide/sourceview/ide-source-view.c
index ebfe7f142..cb6b5db87 100644
--- a/src/libide/sourceview/ide-source-view.c
+++ b/src/libide/sourceview/ide-source-view.c
@@ -33,6 +33,8 @@
 #include "buffers/ide-buffer-manager.h"
 #include "buffers/ide-buffer.h"
 #include "buffers/ide-buffer-private.h"
+#include "completion/ide-completion-provider.h"
+#include "completion/ide-word-completion-provider.h"
 #include "diagnostics/ide-diagnostic.h"
 #include "diagnostics/ide-fixit.h"
 #include "diagnostics/ide-source-location.h"
@@ -48,7 +50,6 @@
 #include "snippets/ide-source-snippet-private.h"
 #include "snippets/ide-source-snippet.h"
 #include "snippets/ide-source-snippets-manager.h"
-#include "sourceview/ide-completion-provider.h"
 #include "sourceview/ide-cursor.h"
 #include "sourceview/ide-indenter.h"
 #include "sourceview/ide-omni-gutter-renderer.h"
@@ -60,7 +61,6 @@
 #include "sourceview/ide-source-view-private.h"
 #include "sourceview/ide-source-view.h"
 #include "sourceview/ide-text-util.h"
-#include "sourceview/ide-word-completion-provider.h"
 #include "symbols/ide-symbol.h"
 #include "symbols/ide-symbol-resolver.h"
 #include "util/ide-gtk.h"
diff --git a/src/libide/sourceview/meson.build b/src/libide/sourceview/meson.build
index 488f8a0d7..2349399bd 100644
--- a/src/libide/sourceview/meson.build
+++ b/src/libide/sourceview/meson.build
@@ -1,7 +1,4 @@
 sourceview_headers = [
-  'ide-completion-item.h',
-  'ide-completion-provider.h',
-  'ide-completion-results.h',
   'ide-indenter.h',
   'ide-language.h',
   'ide-source-iter.h',
@@ -12,9 +9,6 @@ sourceview_headers = [
 ]
 
 sourceview_sources = [
-  'ide-completion-item.c',
-  'ide-completion-provider.c',
-  'ide-completion-results.c',
   'ide-indenter.c',
   'ide-language.c',
   'ide-source-iter.c',
@@ -25,8 +19,6 @@ sourceview_sources = [
 ]
 
 sourceview_private_sources = [
-  'ide-completion-words.c',
-  'ide-completion-words.h',
   'ide-cursor.c',
   'ide-cursor.h',
   'ide-omni-gutter-renderer.c',
@@ -40,12 +32,6 @@ sourceview_private_sources = [
   'ide-source-view-movements.c',
   'ide-source-view-shortcuts.c',
   'ide-text-util.c',
-  'ide-word-completion-item.c',
-  'ide-word-completion-item.h',
-  'ide-word-completion-provider.c',
-  'ide-word-completion-provider.h',
-  'ide-word-completion-results.c',
-  'ide-word-completion-results.h',
 ]
 
 sourceview_enums = [
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]