[gnome-builder] langserv-highlighter: Add IdeLangservHighlighter
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] langserv-highlighter: Add IdeLangservHighlighter
- Date: Thu, 3 Nov 2016 10:12:03 +0000 (UTC)
commit 8f195b850c7e2c156e57d2aa61e868a1a6cc64a2
Author: Christian Hergert <chergert redhat com>
Date: Thu Nov 3 03:10:48 2016 -0700
langserv-highlighter: Add IdeLangservHighlighter
This is a prototype of a semantic highlighter that uses the names of
symbols from the documentSymbol API call of the Language Server Protocol.
It's not ideal, because it's using fuzzy symbols and only those that
exist within the file. However, it gets us something until the Language
Server Protocol addresses semantic highlighting specifically.
libide/Makefile.am | 2 +
libide/langserv/ide-langserv-highlighter.c | 519 ++++++++++++++++++++++++++++
libide/langserv/ide-langserv-highlighter.h | 50 +++
3 files changed, 571 insertions(+), 0 deletions(-)
---
diff --git a/libide/Makefile.am b/libide/Makefile.am
index a2e8a42..833a67e 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -72,6 +72,7 @@ libide_1_0_la_public_headers = \
langserv/ide-langserv-client.h \
langserv/ide-langserv-completion-provider.h \
langserv/ide-langserv-diagnostic-provider.h \
+ langserv/ide-langserv-highlighter.h \
langserv/ide-langserv-rename-provider.h \
langserv/ide-langserv-symbol-node.h \
langserv/ide-langserv-symbol-resolver.h \
@@ -251,6 +252,7 @@ libide_1_0_la_public_sources = \
langserv/ide-langserv-client.c \
langserv/ide-langserv-completion-provider.c \
langserv/ide-langserv-diagnostic-provider.c \
+ langserv/ide-langserv-highlighter.c \
langserv/ide-langserv-rename-provider.c \
langserv/ide-langserv-symbol-node.c \
langserv/ide-langserv-symbol-node-private.h \
diff --git a/libide/langserv/ide-langserv-highlighter.c b/libide/langserv/ide-langserv-highlighter.c
new file mode 100644
index 0000000..3d517c7
--- /dev/null
+++ b/libide/langserv/ide-langserv-highlighter.c
@@ -0,0 +1,519 @@
+/* ide-langserv-highlighter.c
+ *
+ * Copyright (C) 2016 Christian Hergert <chergert redhat com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define G_LOG_DOMAIN "ide-langserv-highlighter"
+
+#include <egg-signal-group.h>
+#include <jsonrpc-glib.h>
+
+#include "ide-debug.h"
+#include "ide-macros.h"
+
+#include "highlighting/ide-highlight-engine.h"
+#include "highlighting/ide-highlight-index.h"
+#include "langserv/ide-langserv-highlighter.h"
+
+#define DELAY_TIMEOUT_MSEC 333
+
+/*
+ * NOTE: This is not an ideal way to do an indexer because we don't get all the
+ * symbols that might be available. It also doesn't allow us to restrict the
+ * highlights to the proper scope. However, until Language Server Protocol
+ * provides a way to do this, it's about the best we can do.
+ */
+
+typedef struct
+{
+ IdeHighlightEngine *engine;
+
+ IdeLangservClient *client;
+ IdeHighlightIndex *index;
+ EggSignalGroup *buffer_signals;
+
+ guint queued_update;
+
+ guint active : 1;
+ guint dirty : 1;
+} IdeLangservHighlighterPrivate;
+
+static void highlighter_iface_init (IdeHighlighterInterface *iface);
+static void ide_langserv_highlighter_queue_update (IdeLangservHighlighter *self);
+
+G_DEFINE_TYPE_WITH_CODE (IdeLangservHighlighter, ide_langserv_highlighter, IDE_TYPE_OBJECT,
+ G_ADD_PRIVATE (IdeLangservHighlighter)
+ G_IMPLEMENT_INTERFACE (IDE_TYPE_HIGHLIGHTER, highlighter_iface_init))
+
+enum {
+ PROP_0,
+ PROP_CLIENT,
+ N_PROPS
+};
+
+static GParamSpec *properties [N_PROPS];
+
+static void
+ide_langserv_highlighter_set_index (IdeLangservHighlighter *self,
+ IdeHighlightIndex *index)
+{
+ IdeLangservHighlighterPrivate *priv = ide_langserv_highlighter_get_instance_private (self);
+
+ IDE_ENTRY;
+
+ g_assert (IDE_IS_LANGSERV_HIGHLIGHTER (self));
+
+ g_clear_pointer (&priv->index, ide_highlight_index_unref);
+ if (index != NULL)
+ priv->index = ide_highlight_index_ref (index);
+
+ if (priv->engine != NULL)
+ {
+ if (priv->index != NULL)
+ ide_highlight_engine_rebuild (priv->engine);
+ else
+ ide_highlight_engine_clear (priv->engine);
+ }
+
+ IDE_EXIT;
+}
+
+static void
+ide_langserv_highlighter_document_symbol_cb (GObject *object,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ IdeLangservClient *client = (IdeLangservClient *)object;
+ g_autoptr(IdeLangservHighlighter) self = user_data;
+ IdeLangservHighlighterPrivate *priv = ide_langserv_highlighter_get_instance_private (self);
+ g_autoptr(JsonNode) return_value = NULL;
+ g_autoptr(GError) error = NULL;
+ JsonArray *ar;
+
+ IDE_ENTRY;
+
+ g_assert (IDE_IS_LANGSERV_CLIENT (client));
+ g_assert (G_IS_ASYNC_RESULT (result));
+ g_assert (IDE_IS_LANGSERV_HIGHLIGHTER (self));
+
+ priv->active = FALSE;
+
+ if (!ide_langserv_client_call_finish (client, result, &return_value, &error))
+ {
+ g_message ("%s", error->message);
+ IDE_EXIT;
+ }
+
+ /*
+ * TODO: We should get the tag to have the proper name based
+ * on the type.
+ */
+
+ if (JSON_NODE_HOLDS_ARRAY (return_value) && NULL != (ar = json_node_get_array (return_value)))
+ {
+ g_autoptr(IdeHighlightIndex) index = ide_highlight_index_new ();
+ guint length = json_array_get_length (ar);
+
+ for (guint i = 0; i < length; i++)
+ {
+ JsonNode *member = json_array_get_element (ar, i);
+ const gchar *name = NULL;
+ const gchar *tag;
+ gboolean success;
+ gint kind = 0;
+
+ success = JCON_EXTRACT (member,
+ "name", JCONE_STRING (name),
+ "kind", JCONE_INT (kind)
+ );
+
+ if (!success)
+ continue;
+
+ switch (kind)
+ {
+ case 6: /* METHOD */
+ case 12: /* FUNCTION */
+ case 9: /* CONSTRUCTOR */
+ tag = "def:function";
+ break;
+
+ case 2: /* MODULE */
+ case 3: /* NAMESPACE */
+ case 4: /* PACKAGE */
+ case 5: /* CLASS */
+ case 10: /* ENUM */
+ case 11: /* INTERFACE */
+ tag = "def:type";
+ break;
+
+
+ case 14: /* CONSTANT */
+ tag = "def:constant";
+ break;
+
+ case 7: /* PROPERTY */
+ case 8: /* FIELD */
+ case 13: /* VARIABLE */
+ tag = "def:identifier";
+ break;
+
+ default:
+ tag = NULL;
+ }
+
+ if (tag != NULL)
+ ide_highlight_index_insert (index, name, (gpointer)tag);
+ }
+
+ ide_langserv_highlighter_set_index (self, index);
+ }
+
+ if (priv->dirty)
+ ide_langserv_highlighter_queue_update (self);
+
+ IDE_EXIT;
+}
+
+static gboolean
+ide_langserv_highlighter_update_symbols (gpointer data)
+{
+ IdeLangservHighlighter *self = data;
+ IdeLangservHighlighterPrivate *priv = ide_langserv_highlighter_get_instance_private (self);
+
+ g_assert (IDE_IS_LANGSERV_HIGHLIGHTER (self));
+
+ priv->queued_update = 0;
+
+ if (priv->client != NULL && priv->engine != NULL)
+ {
+ g_autoptr(JsonNode) params = NULL;
+ g_autofree gchar *uri = NULL;
+ IdeBuffer *buffer;
+
+ buffer = ide_highlight_engine_get_buffer (priv->engine);
+ uri = ide_buffer_get_uri (buffer);
+
+ params = JCON_NEW (
+ "textDocument", "{",
+ "uri", JCON_STRING (uri),
+ "}"
+ );
+
+ priv->active = TRUE;
+ priv->dirty = FALSE;
+
+ ide_langserv_client_call_async (priv->client,
+ "textDocument/documentSymbol",
+ g_steal_pointer (¶ms),
+ NULL,
+ ide_langserv_highlighter_document_symbol_cb,
+ g_object_ref (self));
+ }
+
+ return G_SOURCE_REMOVE;
+}
+
+static void
+ide_langserv_highlighter_queue_update (IdeLangservHighlighter *self)
+{
+ IdeLangservHighlighterPrivate *priv = ide_langserv_highlighter_get_instance_private (self);
+
+ IDE_ENTRY;
+
+ g_assert (IDE_IS_LANGSERV_HIGHLIGHTER (self));
+
+ priv->dirty = TRUE;
+
+ /*
+ * Queue an update to get the newest symbol list (which we'll use to build
+ * the highlight index).
+ */
+
+ if (priv->queued_update == 0 && priv->active == FALSE)
+ {
+ priv->queued_update = g_timeout_add (DELAY_TIMEOUT_MSEC,
+ ide_langserv_highlighter_update_symbols,
+ self);
+ }
+
+ IDE_EXIT;
+}
+
+static void
+ide_langserv_highlighter_buffer_line_flags_changed (IdeLangservHighlighter *self,
+ IdeBuffer *buffer)
+{
+ g_assert (IDE_IS_LANGSERV_HIGHLIGHTER (self));
+ g_assert (IDE_IS_BUFFER (buffer));
+
+ ide_langserv_highlighter_queue_update (self);
+}
+
+static void
+ide_langserv_highlighter_finalize (GObject *object)
+{
+ IdeLangservHighlighter *self = (IdeLangservHighlighter *)object;
+ IdeLangservHighlighterPrivate *priv = ide_langserv_highlighter_get_instance_private (self);
+
+ priv->engine = NULL;
+
+ ide_clear_source (&priv->queued_update);
+
+ g_clear_pointer (&priv->index, ide_highlight_index_unref);
+ g_clear_object (&priv->buffer_signals);
+ g_clear_object (&priv->client);
+
+ G_OBJECT_CLASS (ide_langserv_highlighter_parent_class)->finalize (object);
+}
+
+static void
+ide_langserv_highlighter_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ IdeLangservHighlighter *self = IDE_LANGSERV_HIGHLIGHTER (object);
+
+ switch (prop_id)
+ {
+ case PROP_CLIENT:
+ g_value_set_object (value, ide_langserv_highlighter_get_client (self));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static void
+ide_langserv_highlighter_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ IdeLangservHighlighter *self = IDE_LANGSERV_HIGHLIGHTER (object);
+
+ switch (prop_id)
+ {
+ case PROP_CLIENT:
+ ide_langserv_highlighter_set_client (self, g_value_get_object (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static void
+ide_langserv_highlighter_class_init (IdeLangservHighlighterClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->finalize = ide_langserv_highlighter_finalize;
+ object_class->get_property = ide_langserv_highlighter_get_property;
+ object_class->set_property = ide_langserv_highlighter_set_property;
+
+ properties [PROP_CLIENT] =
+ g_param_spec_object ("client",
+ "Client",
+ "Client",
+ IDE_TYPE_LANGSERV_CLIENT,
+ (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_properties (object_class, N_PROPS, properties);
+}
+
+static void
+ide_langserv_highlighter_init (IdeLangservHighlighter *self)
+{
+ IdeLangservHighlighterPrivate *priv = ide_langserv_highlighter_get_instance_private (self);
+
+ priv->buffer_signals = egg_signal_group_new (IDE_TYPE_BUFFER);
+
+ /*
+ * We sort of cheat here by using ::line-flags-changed instead of :;changed
+ * because it signifies to us that a diagnostics query has come back from the
+ * language server and therefore we are more likely to get a valid response
+ * for the documentation lookup. Otherwise, we can often get in a situation
+ * where the language server gives us an empty set back (or at least with
+ * the rust language server).
+ */
+ egg_signal_group_connect_object (priv->buffer_signals,
+ "line-flags-changed",
+ G_CALLBACK (ide_langserv_highlighter_buffer_line_flags_changed),
+ self,
+ G_CONNECT_SWAPPED);
+}
+
+/**
+ * ide_langserv_highlighter_get_client:
+ *
+ * Returns: (transfer none) (nullable): An #IdeLangservHighlighter or %NULL.
+ */
+IdeLangservClient *
+ide_langserv_highlighter_get_client (IdeLangservHighlighter *self)
+{
+ IdeLangservHighlighterPrivate *priv = ide_langserv_highlighter_get_instance_private (self);
+
+ g_return_val_if_fail (IDE_IS_LANGSERV_HIGHLIGHTER (self), NULL);
+
+ return priv->client;
+}
+
+void
+ide_langserv_highlighter_set_client (IdeLangservHighlighter *self,
+ IdeLangservClient *client)
+{
+ IdeLangservHighlighterPrivate *priv = ide_langserv_highlighter_get_instance_private (self);
+
+ g_return_if_fail (IDE_IS_LANGSERV_HIGHLIGHTER (self));
+ g_return_if_fail (!client || IDE_IS_LANGSERV_CLIENT (client));
+
+ if (g_set_object (&priv->client, client))
+ {
+ ide_langserv_highlighter_queue_update (self);
+ g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_CLIENT]);
+ }
+}
+
+static inline gboolean
+accepts_char (gunichar ch)
+{
+ return (ch == '_' || g_unichar_isalnum (ch));
+}
+
+static inline gboolean
+select_next_word (GtkTextIter *begin,
+ GtkTextIter *end)
+{
+
+ g_assert (begin != NULL);
+ g_assert (end != NULL);
+
+ *end = *begin;
+
+ while (!accepts_char (gtk_text_iter_get_char (begin)))
+ if (!gtk_text_iter_forward_char (begin))
+ return FALSE;
+
+ *end = *begin;
+
+ while (accepts_char (gtk_text_iter_get_char (end)))
+ if (!gtk_text_iter_forward_char (end))
+ return !gtk_text_iter_equal (begin, end);
+
+ return TRUE;
+}
+
+static void
+ide_langserv_highlighter_update (IdeHighlighter *highlighter,
+ IdeHighlightCallback callback,
+ const GtkTextIter *range_begin,
+ const GtkTextIter *range_end,
+ GtkTextIter *location)
+{
+ IdeLangservHighlighter *self = (IdeLangservHighlighter *)highlighter;
+ IdeLangservHighlighterPrivate *priv = ide_langserv_highlighter_get_instance_private (self);
+ GtkSourceBuffer *source_buffer;
+ GtkTextIter begin;
+ GtkTextIter end;
+
+ g_assert (IDE_IS_LANGSERV_HIGHLIGHTER (self));
+ g_assert (callback != NULL);
+
+ if (priv->index == NULL)
+ {
+ *location = *range_end;
+ return;
+ }
+
+ source_buffer = GTK_SOURCE_BUFFER (gtk_text_iter_get_buffer (range_begin));
+
+ begin = end = *location = *range_begin;
+
+ while (gtk_text_iter_compare (&begin, range_end) < 0)
+ {
+ if (!select_next_word (&begin, &end))
+ goto completed;
+
+ if (gtk_text_iter_compare (&begin, range_end) >= 0)
+ goto completed;
+
+ g_assert (!gtk_text_iter_equal (&begin, &end));
+
+ if (!gtk_source_buffer_iter_has_context_class (source_buffer, &begin, "string") &&
+ !gtk_source_buffer_iter_has_context_class (source_buffer, &begin, "path") &&
+ !gtk_source_buffer_iter_has_context_class (source_buffer, &begin, "comment"))
+ {
+ const gchar *tag;
+ gchar *word;
+
+ word = gtk_text_iter_get_slice (&begin, &end);
+ tag = ide_highlight_index_lookup (priv->index, word);
+ g_free (word);
+
+ if (tag != NULL)
+ {
+ if (callback (&begin, &end, tag) == IDE_HIGHLIGHT_STOP)
+ {
+ *location = end;
+ return;
+ }
+ }
+ }
+
+ begin = end;
+ }
+
+completed:
+ *location = *range_end;
+}
+
+static void
+ide_langserv_highlighter_set_engine (IdeHighlighter *highlighter,
+ IdeHighlightEngine *engine)
+{
+ IdeLangservHighlighter *self = (IdeLangservHighlighter *)highlighter;
+ IdeLangservHighlighterPrivate *priv = ide_langserv_highlighter_get_instance_private (self);
+
+ IDE_ENTRY;
+
+ g_assert (IDE_IS_LANGSERV_HIGHLIGHTER (self));
+ g_assert (!engine || IDE_IS_HIGHLIGHT_ENGINE (engine));
+
+ priv->engine = engine;
+
+ egg_signal_group_set_target (priv->buffer_signals, NULL);
+
+ if (engine != NULL)
+ {
+ IdeBuffer *buffer;
+
+ buffer = ide_highlight_engine_get_buffer (engine);
+ egg_signal_group_set_target (priv->buffer_signals, buffer);
+ ide_langserv_highlighter_queue_update (self);
+ }
+
+ IDE_EXIT;
+}
+
+static void
+highlighter_iface_init (IdeHighlighterInterface *iface)
+{
+ iface->update = ide_langserv_highlighter_update;
+ iface->set_engine = ide_langserv_highlighter_set_engine;
+}
diff --git a/libide/langserv/ide-langserv-highlighter.h b/libide/langserv/ide-langserv-highlighter.h
new file mode 100644
index 0000000..58bbb94
--- /dev/null
+++ b/libide/langserv/ide-langserv-highlighter.h
@@ -0,0 +1,50 @@
+/* ide-langserv-highlighter.h
+ *
+ * Copyright (C) 2016 Christian Hergert <chergert redhat com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef IDE_LANGSERV_HIGHLIGHTER_H
+#define IDE_LANGSERV_HIGHLIGHTER_H
+
+#include "ide-object.h"
+
+#include "highlighting/ide-highlighter.h"
+#include "langserv/ide-langserv-client.h"
+
+G_BEGIN_DECLS
+
+#define IDE_TYPE_LANGSERV_HIGHLIGHTER (ide_langserv_highlighter_get_type())
+
+G_DECLARE_DERIVABLE_TYPE (IdeLangservHighlighter, ide_langserv_highlighter, IDE, LANGSERV_HIGHLIGHTER,
IdeObject)
+
+struct _IdeLangservHighlighterClass
+{
+ IdeObjectClass parent_class;
+
+ gpointer _reserved1;
+ gpointer _reserved2;
+ gpointer _reserved3;
+ gpointer _reserved4;
+};
+
+IdeLangservClient *ide_langserv_highlighter_get_client (IdeLangservHighlighter *self);
+void ide_langserv_highlighter_set_client (IdeLangservHighlighter *self,
+ IdeLangservClient *client);
+
+G_END_DECLS
+
+#endif /* IDE_LANGSERV_HIGHLIGHTER_H */
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
