lex MD: dont make ranges for fenced-blocks

Alexey-T · Jan 17, 2024 · aed92f3 · aed92f3
1 parent 6ef4cef
commit aed92f3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/app/cudatext.app/Contents/Resources/data/lexlib/Markdown.lcf b/app/cudatext.app/Contents/Resources/data/lexlib/Markdown.lcf
@@ -1,4 +1,4 @@
-object SyntAnal15: TLibSyntAnalyzer
+object SyntAnal13: TLibSyntAnalyzer
   Formats = <
     item
       DisplayName = 'Heading'
@@ -738,6 +738,7 @@ object SyntAnal15: TLibSyntAnalyzer
     end
     item
       DisplayName = '`begin'
+      Enabled = False
       StyleName = 'Codeblock'
       ConditionList = <
         item
@@ -752,6 +753,7 @@ object SyntAnal15: TLibSyntAnalyzer
     end
     item
       DisplayName = '`end'
+      Enabled = False
       BlockType = btRangeEnd
       ConditionList = <
         item
@@ -762,6 +764,7 @@ object SyntAnal15: TLibSyntAnalyzer
     end
     item
       DisplayName = '~begin'
+      Enabled = False
       StyleName = 'Codeblock'
       ConditionList = <
         item
@@ -776,6 +779,7 @@ object SyntAnal15: TLibSyntAnalyzer
     end
     item
       DisplayName = '~end'
+      Enabled = False
       BlockType = btRangeEnd
       ConditionList = <
         item
@@ -955,15 +959,14 @@ object SyntAnal15: TLibSyntAnalyzer
       StatesAbsent = 3
       StartExpression = '<\?'
       EndExpression = '\?>'
-      SyntAnalyzer = SyntAnal18
       IncludeBounds = True
     end
     item
       DisplayName = 'JS'
       StatesAbsent = 3
       StartExpression = '(?s)<script\b.*?>'
       EndExpression = '</script>'
-      SyntAnalyzer = SyntAnal11
+      SyntAnalyzer = SyntAnal9
     end
     item
       DisplayName = 'CSS'
@@ -976,19 +979,19 @@ object SyntAnal15: TLibSyntAnalyzer
       DisplayName = 'YAML front matter'
       StartExpression = '\A---(\s*yaml)?$'
       EndExpression = '^(---|\.\.\.)$'
-      SyntAnalyzer = SyntAnal26
+      SyntAnalyzer = SyntAnal22
     end
     item
       DisplayName = 'JSON front matter'
       StartExpression = '\A---\s*json$'
       EndExpression = '^---$'
-      SyntAnalyzer = SyntAnal13
+      SyntAnalyzer = SyntAnal11
     end
     item
       DisplayName = 'Fenced block'
       StartExpression = '(?<=^\x20{0,3})(`{3,}|~{3,})\x20*\w.*$'
       EndExpression = '(?<=^\x20{0,3})(`{3,}|~{3,})\x20*$'
-      SyntAnalyzer = SyntAnal9
+      SyntAnalyzer = SyntAnal8
     end>
   SampleText.Strings = (
     '---'

diff --git a/app/data/lexlib/Markdown.lcf b/app/data/lexlib/Markdown.lcf
@@ -1,4 +1,4 @@
-object SyntAnal15: TLibSyntAnalyzer
+object SyntAnal13: TLibSyntAnalyzer
   Formats = <
     item
       DisplayName = 'Heading'
@@ -738,6 +738,7 @@ object SyntAnal15: TLibSyntAnalyzer
     end
     item
       DisplayName = '`begin'
+      Enabled = False
       StyleName = 'Codeblock'
       ConditionList = <
         item
@@ -752,6 +753,7 @@ object SyntAnal15: TLibSyntAnalyzer
     end
     item
       DisplayName = '`end'
+      Enabled = False
       BlockType = btRangeEnd
       ConditionList = <
         item
@@ -762,6 +764,7 @@ object SyntAnal15: TLibSyntAnalyzer
     end
     item
       DisplayName = '~begin'
+      Enabled = False
       StyleName = 'Codeblock'
       ConditionList = <
         item
@@ -776,6 +779,7 @@ object SyntAnal15: TLibSyntAnalyzer
     end
     item
       DisplayName = '~end'
+      Enabled = False
       BlockType = btRangeEnd
       ConditionList = <
         item
@@ -955,15 +959,14 @@ object SyntAnal15: TLibSyntAnalyzer
       StatesAbsent = 3
       StartExpression = '<\?'
       EndExpression = '\?>'
-      SyntAnalyzer = SyntAnal18
       IncludeBounds = True
     end
     item
       DisplayName = 'JS'
       StatesAbsent = 3
       StartExpression = '(?s)<script\b.*?>'
       EndExpression = '</script>'
-      SyntAnalyzer = SyntAnal11
+      SyntAnalyzer = SyntAnal9
     end
     item
       DisplayName = 'CSS'
@@ -976,19 +979,19 @@ object SyntAnal15: TLibSyntAnalyzer
       DisplayName = 'YAML front matter'
       StartExpression = '\A---(\s*yaml)?$'
       EndExpression = '^(---|\.\.\.)$'
-      SyntAnalyzer = SyntAnal26
+      SyntAnalyzer = SyntAnal22
     end
     item
       DisplayName = 'JSON front matter'
       StartExpression = '\A---\s*json$'
       EndExpression = '^---$'
-      SyntAnalyzer = SyntAnal13
+      SyntAnalyzer = SyntAnal11
     end
     item
       DisplayName = 'Fenced block'
       StartExpression = '(?<=^\x20{0,3})(`{3,}|~{3,})\x20*\w.*$'
       EndExpression = '(?<=^\x20{0,3})(`{3,}|~{3,})\x20*$'
-      SyntAnalyzer = SyntAnal9
+      SyntAnalyzer = SyntAnal8
     end>
   SampleText.Strings = (
     '---'