[gnome-builder/wip/chergert/completion] vala: fixup markup building to only highlight symbol name
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/wip/chergert/completion] vala: fixup markup building to only highlight symbol name
- Date: Tue, 5 Jun 2018 07:55:41 +0000 (UTC)
commit 76eabbbd68e528b316a3c0f5b145c50eb743cb87
Author: Christian Hergert <chergert redhat com>
Date: Tue Jun 5 00:54:56 2018 -0700
vala: fixup markup building to only highlight symbol name
.../vala-pack/ide-vala-completion-item.vala | 24 +++++++---------------
1 file changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/src/plugins/vala-pack/ide-vala-completion-item.vala
b/src/plugins/vala-pack/ide-vala-completion-item.vala
index a23e1707f..d138d6e11 100644
--- a/src/plugins/vala-pack/ide-vala-completion-item.vala
+++ b/src/plugins/vala-pack/ide-vala-completion-item.vala
@@ -25,7 +25,6 @@ namespace Ide
public class ValaCompletionItem : GLib.Object, Ide.CompletionProposal
{
internal Vala.Symbol symbol;
- string label;
uint priority;
public ValaCompletionItem (Vala.Symbol symbol)
@@ -82,13 +81,17 @@ namespace Ide
return in.replace ("<", "<").replace (">", ">");
}
- public void build_label ()
+ public string get_markup (string? typed_text)
{
GLib.StringBuilder str = new GLib.StringBuilder ();
+ var highlight = Ide.CompletionItem.fuzzy_highlight (this.symbol.name, typed_text !=
null ? typed_text : "");
+
+ if (highlight != null)
+ str.append(highlight);
+
if (this.symbol is Vala.Method) {
var method = symbol as Vala.Method;
- str.append(method.name);
var type_params = method.get_type_parameters ();
if (type_params.size > 0) {
str.append ("<");
@@ -120,22 +123,9 @@ namespace Ide
str.truncate (str.len - 2);
}
str.append (")</span>");
- } else {
- str.append (this.symbol.name);
}
- /* Steal the string instead of strdup */
- this.label = (owned)str.str;
- }
-
- public string get_markup (string? typed_text) {
- return Ide.CompletionItem.fuzzy_highlight (this.get_label (), typed_text != null ?
typed_text : "");
- }
-
- public unowned string get_label () {
- if (this.label == null)
- this.build_label ();
- return this.label;
+ return str.str;
}
public string? get_return_type () {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]