wip #10 & #35. ❌ inline @section ❌

EmranMR · Sep 3, 2023 · 902310a · 902310a
1 parent faf11e0
commit 902310a
Show file tree

Hide file tree

Showing 6 changed files with 7,388 additions and 7,284 deletions.
diff --git a/corpus/keywords.txt b/corpus/keywords.txt
@@ -18,6 +18,17 @@
 
 ---
 
+(blade
+  (keyword
+    (directive)))
+==================
+@parent
+==================
+
+@parent
+
+---
+
 (blade
   (keyword
     (directive)))
diff --git a/corpus/nested-directives.txt b/corpus/nested-directives.txt
@@ -22,9 +22,14 @@
 @section
 ================================================================================
 
-@section('test')
-        section
-@endsection
+        @section('sidebar')
+            This is the master sidebar.
+        @show
+
+        @section('test')
+          @parent
+            test
+        @endsection
 
 
 --------------------------------------------------------------------------------
@@ -36,6 +41,15 @@
     (parameter)
     (bracket_end)
     (php)
+    (directive_end))
+  (section
+    (directive_start)
+    (bracket_start)
+    (parameter)
+    (bracket_end)
+    (keyword
+      (directive))
+    (php)
     (directive_end)))
 
 ================================================================================

diff --git a/example-file.blade b/example-file.blade
@@ -0,0 +1,5 @@
+@section('test' , 'test')
+
+@section('test')
+    text
+@endsection
diff --git a/grammar.js b/grammar.js
@@ -20,7 +20,7 @@ module.exports = grammar({
         // !keywords
         keyword: ($) =>
             alias(
-                /@(csrf|viteReactRefresh|livewireStyles|livewireScripts|livewireScriptConfig)/,
+                /@(csrf|viteReactRefresh|livewireStyles|livewireScripts|livewireScriptConfig|parent)/,
                 $.directive
             ),
         // ! PHP Statements
@@ -64,7 +64,7 @@ module.exports = grammar({
         _inline_directive: ($) =>
             seq(
                 alias(
-                    /@(extends|yield|include|includeIf|includeWhen|includeUnless|includeFirst|props|method|inject|each|vite|livewire|aware)/,
+                    /@(extends|yield|include|includeIf|includeWhen|includeUnless|includeFirst|props|method|inject|each|vite|livewire|aware|section)/,
                     $.directive
                 ),
                 $._directive_parameter
@@ -96,7 +96,7 @@ module.exports = grammar({
             seq(
                 alias('@section', $.directive_start),
                 $._directive_body_with_parameter,
-                alias('@endsection', $.directive_end)
+                alias(/@(endsection|show)/, $.directive_end)
             ),
 
         // once

diff --git a/src/grammar.json b/src/grammar.json
@@ -78,7 +78,7 @@
       "type": "ALIAS",
       "content": {
         "type": "PATTERN",
-        "value": "@(csrf|viteReactRefresh|livewireStyles|livewireScripts|livewireScriptConfig)"
+        "value": "@(csrf|viteReactRefresh|livewireStyles|livewireScripts|livewireScriptConfig|parent)"
       },
       "named": true,
       "value": "directive"
@@ -285,7 +285,7 @@
           "type": "ALIAS",
           "content": {
             "type": "PATTERN",
-            "value": "@(extends|yield|include|includeIf|includeWhen|includeUnless|includeFirst|props|method|inject|each|vite|livewire|aware)"
+            "value": "@(extends|yield|include|includeIf|includeWhen|includeUnless|includeFirst|props|method|inject|each|vite|livewire|aware|section)"
           },
           "named": true,
           "value": "directive"
@@ -383,8 +383,8 @@
         {
           "type": "ALIAS",
           "content": {
-            "type": "STRING",
-            "value": "@endsection"
+            "type": "PATTERN",
+            "value": "@(endsection|show)"
           },
           "named": true,
           "value": "directive_end"