From 8af58270f90e7eb0123c23482b4c7ffdb98dafa8 Mon Sep 17 00:00:00 2001
From: oidro <31112680+oidro@users.noreply.github.com>
Date: Thu, 2 Jun 2022 15:54:28 -0400
Subject: [PATCH 1/2] Fix logic operator highlighting

---
 syntaxes/GDScript.tmLanguage.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/syntaxes/GDScript.tmLanguage.json b/syntaxes/GDScript.tmLanguage.json
index b9b3702d3..50d043250 100644
--- a/syntaxes/GDScript.tmLanguage.json
+++ b/syntaxes/GDScript.tmLanguage.json
@@ -686,6 +686,9 @@
                 {
                     "include": "#builtin_classes"
                 },
+                {
+                    "include": "#logic_op"
+                },
                 {
                     "comment": "Some color schemas support meta.function-call.generic scope",
                     "name": "support.function.any-method.gdscript",

From ed57d6459cd1d681ef9df10793e010a67e2436e8 Mon Sep 17 00:00:00 2001
From: oidro <31112680+oidro@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:07:22 -0400
Subject: [PATCH 2/2] Improve placement of include

Make logic_op a part of base_expression, rather than adding a new pattern to another rule.
---
 syntaxes/GDScript.tmLanguage.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/syntaxes/GDScript.tmLanguage.json b/syntaxes/GDScript.tmLanguage.json
index 50d043250..f15c4235f 100644
--- a/syntaxes/GDScript.tmLanguage.json
+++ b/syntaxes/GDScript.tmLanguage.json
@@ -220,6 +220,9 @@
                 {
                     "include": "#keywords"
                 },
+                {
+                    "include": "#logic_op"
+                },
                 {
                     "include": "#control_flow"
                 },
@@ -686,9 +689,6 @@
                 {
                     "include": "#builtin_classes"
                 },
-                {
-                    "include": "#logic_op"
-                },
                 {
                     "comment": "Some color schemas support meta.function-call.generic scope",
                     "name": "support.function.any-method.gdscript",