From 981c2e3b7d90af971d223ab528a2ef2cfe819be0 Mon Sep 17 00:00:00 2001 From: James Westman Date: Fri, 12 Nov 2021 17:47:09 -0600 Subject: [PATCH] Remove the ':' in a few places Changed my mind, I think it's more confusing to use the colon for properties when they aren't really properties. --- gtkblueprinttool/extensions/gtk_file_filter.py | 7 +++---- gtkblueprinttool/extensions/gtk_size_group.py | 3 +-- gtkblueprinttool/extensions/gtk_styles.py | 3 +-- tests/sample_errors/size_group_non_widget.blp | 2 +- tests/sample_errors/size_group_non_widget.err | 2 +- tests/sample_errors/size_group_obj_dne.blp | 2 +- tests/sample_errors/size_group_obj_dne.err | 2 +- tests/samples/file_filter.blp | 6 +++--- tests/samples/size_group.blp | 2 +- tests/samples/style.blp | 2 +- 10 files changed, 14 insertions(+), 17 deletions(-) diff --git a/gtkblueprinttool/extensions/gtk_file_filter.py b/gtkblueprinttool/extensions/gtk_file_filter.py index 90a23f3..5d809b4 100644 --- a/gtkblueprinttool/extensions/gtk_file_filter.py +++ b/gtkblueprinttool/extensions/gtk_file_filter.py @@ -48,7 +48,6 @@ def create_node(tag_name: str, singular: str): Statement( Keyword(tag_name), UseLiteral("tag_name", tag_name), - Op(":"), OpenBracket(), Delimited( Group( @@ -77,7 +76,7 @@ suffixes = create_node("suffixes", "suffix") def file_filter_completer(ast_node, match_variables): file_filter = ast_node.root.gir.get_type("FileFilter", "Gtk") if ast_node.gir_class and ast_node.gir_class.assignable_to(file_filter): - yield Completion("mime-types", CompletionItemKind.Snippet, snippet="mime-types: [\"$0\"];") - yield Completion("patterns", CompletionItemKind.Snippet, snippet="patterns: [\"$0\"];") - yield Completion("suffixes", CompletionItemKind.Snippet, snippet="suffixes: [\"$0\"];") + yield Completion("mime-types", CompletionItemKind.Snippet, snippet="mime-types [\"$0\"];") + yield Completion("patterns", CompletionItemKind.Snippet, snippet="patterns [\"$0\"];") + yield Completion("suffixes", CompletionItemKind.Snippet, snippet="suffixes [\"$0\"];") diff --git a/gtkblueprinttool/extensions/gtk_size_group.py b/gtkblueprinttool/extensions/gtk_size_group.py index 7ce26b5..6368c37 100644 --- a/gtkblueprinttool/extensions/gtk_size_group.py +++ b/gtkblueprinttool/extensions/gtk_size_group.py @@ -58,7 +58,6 @@ widgets = Group( Widgets, Statement( Keyword("widgets"), - Op(":"), OpenBracket(), Delimited( Group( @@ -79,4 +78,4 @@ widgets = Group( def file_filter_completer(ast_node, match_variables): file_filter = ast_node.root.gir.get_type("SizeGroup", "Gtk") if ast_node.gir_class and ast_node.gir_class.assignable_to(file_filter): - yield Completion("widgets", CompletionItemKind.Snippet, snippet="mime-types: [$0];") + yield Completion("widgets", CompletionItemKind.Snippet, snippet="widgets [$0];") diff --git a/gtkblueprinttool/extensions/gtk_styles.py b/gtkblueprinttool/extensions/gtk_styles.py index 17a7b89..b29cefd 100644 --- a/gtkblueprinttool/extensions/gtk_styles.py +++ b/gtkblueprinttool/extensions/gtk_styles.py @@ -44,7 +44,6 @@ styles = Group( Styles, Statement( Keyword("styles"), - Op(":"), OpenBracket(), Delimited( Group( @@ -63,5 +62,5 @@ styles = Group( matches=new_statement_patterns, ) def style_completer(ast_node, match_variables): - yield Completion("styles", CompletionItemKind.Keyword, snippet="styles: [\"$0\"];") + yield Completion("styles", CompletionItemKind.Keyword, snippet="styles [\"$0\"];") diff --git a/tests/sample_errors/size_group_non_widget.blp b/tests/sample_errors/size_group_non_widget.blp index 935a113..4f99ea2 100644 --- a/tests/sample_errors/size_group_non_widget.blp +++ b/tests/sample_errors/size_group_non_widget.blp @@ -3,7 +3,7 @@ using GObject 2.0; SizeGroup { mode: horizontal; - widgets: [object]; + widgets [object]; } GObject.Object object {} diff --git a/tests/sample_errors/size_group_non_widget.err b/tests/sample_errors/size_group_non_widget.err index 872f533..53ca6a5 100644 --- a/tests/sample_errors/size_group_non_widget.err +++ b/tests/sample_errors/size_group_non_widget.err @@ -1 +1 @@ -6,13,6,Cannot assign GObject.Object to Gtk.Widget +6,12,6,Cannot assign GObject.Object to Gtk.Widget diff --git a/tests/sample_errors/size_group_obj_dne.blp b/tests/sample_errors/size_group_obj_dne.blp index 603e1b8..0e43faa 100644 --- a/tests/sample_errors/size_group_obj_dne.blp +++ b/tests/sample_errors/size_group_obj_dne.blp @@ -3,5 +3,5 @@ using GObject 2.0; SizeGroup { mode: horizontal; - widgets: [object]; + widgets [object]; } diff --git a/tests/sample_errors/size_group_obj_dne.err b/tests/sample_errors/size_group_obj_dne.err index 8e64afd..e23cfb2 100644 --- a/tests/sample_errors/size_group_obj_dne.err +++ b/tests/sample_errors/size_group_obj_dne.err @@ -1 +1 @@ -6,13,6,Could not find object with ID object +6,12,6,Could not find object with ID object diff --git a/tests/samples/file_filter.blp b/tests/samples/file_filter.blp index 8c91014..509acdc 100644 --- a/tests/samples/file_filter.blp +++ b/tests/samples/file_filter.blp @@ -2,7 +2,7 @@ using Gtk 4.0; FileFilter { name: "File Filter Name"; - mime-types: ["text/plain", "image/ *"]; - patterns: ["*.txt"]; - suffixes: ["png"]; + mime-types ["text/plain", "image/ *"]; + patterns ["*.txt"]; + suffixes ["png"]; } diff --git a/tests/samples/size_group.blp b/tests/samples/size_group.blp index 47dd56e..c48958b 100644 --- a/tests/samples/size_group.blp +++ b/tests/samples/size_group.blp @@ -2,7 +2,7 @@ using Gtk 4.0; SizeGroup { mode: horizontal; - widgets: [label, button]; + widgets [label, button]; } Label label {} diff --git a/tests/samples/style.blp b/tests/samples/style.blp index fc3f023..a42aa65 100644 --- a/tests/samples/style.blp +++ b/tests/samples/style.blp @@ -1,5 +1,5 @@ using Gtk 4.0; Label { - styles: ["class-1", "class-2"]; + styles ["class-1", "class-2"]; }