more for #5623

Alexey-T · Jul 19, 2024 · cfbcf65 · cfbcf65
1 parent c090a75
commit cfbcf65
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/app/cudatext.app/Contents/Resources/data/lexlib/JSDoc.lcf b/app/cudatext.app/Contents/Resources/data/lexlib/JSDoc.lcf
@@ -1,4 +1,4 @@
-object SyntAnal12: TLibSyntAnalyzer
+object SyntAnal10: TLibSyntAnalyzer
   Formats = <
     item
       DisplayName = 'Comment doc'
@@ -87,7 +87,7 @@ object SyntAnal12: TLibSyntAnalyzer
     item
       DisplayName = 'Comment'
       StyleName = 'Comment doc'
-      Expression = '\*|[^\x20\x09\n\r]+'
+      Expression = '[^\x20\x09\n\r\*/]+'
       ColumnFrom = 0
       ColumnTo = 0
     end>

diff --git a/app/cudatext.app/Contents/Resources/data/lexlib/JavaScript.lcf b/app/cudatext.app/Contents/Resources/data/lexlib/JavaScript.lcf
@@ -156,16 +156,20 @@ object SyntAnal9: TLibSyntAnalyzer
       ColumnTo = 0
     end
     item
-      DisplayName = 'Comment doc'
+      DisplayName = 'Comment doc begin'
       StyleName = 'Comment doc'
+      StatesAdd = 1
+      StatesAbsent = 1
       TokenType = 1
-      Expression = '(?s)/\*\*.*?(\*/|\Z)'
+      Expression = '/\*{2,}'
       ColumnFrom = 0
       ColumnTo = 0
     end
     item
-      DisplayName = 'Comment doc end-only'
+      DisplayName = 'Comment doc end'
       StyleName = 'Comment doc'
+      StatesRemove = 1
+      StatesPresent = 1
       TokenType = 1
       Expression = '\*/'
       ColumnFrom = 0
@@ -957,8 +961,10 @@ object SyntAnal9: TLibSyntAnalyzer
     end
     item
       DisplayName = 'JSDoc'
+      StatesAdd = 1
+      StatesRemove = 1
       StartExpression = '/\*{2,}(?!/)'
-      EndExpression = '[^/\*\n\r]*?\*/'
+      EndExpression = '\*/'
       SyntAnalyzer = SyntAnal10
     end>
   SampleText.Strings = (

diff --git a/app/data/lexlib/JSDoc.lcf b/app/data/lexlib/JSDoc.lcf
@@ -1,4 +1,4 @@
-object SyntAnal12: TLibSyntAnalyzer
+object SyntAnal10: TLibSyntAnalyzer
   Formats = <
     item
       DisplayName = 'Comment doc'
@@ -87,7 +87,7 @@ object SyntAnal12: TLibSyntAnalyzer
     item
       DisplayName = 'Comment'
       StyleName = 'Comment doc'
-      Expression = '\*|[^\x20\x09\n\r]+'
+      Expression = '[^\x20\x09\n\r\*/]+'
       ColumnFrom = 0
       ColumnTo = 0
     end>

diff --git a/app/data/lexlib/JavaScript.lcf b/app/data/lexlib/JavaScript.lcf
@@ -156,16 +156,20 @@ object SyntAnal9: TLibSyntAnalyzer
       ColumnTo = 0
     end
     item
-      DisplayName = 'Comment doc'
+      DisplayName = 'Comment doc begin'
       StyleName = 'Comment doc'
+      StatesAdd = 1
+      StatesAbsent = 1
       TokenType = 1
-      Expression = '(?s)/\*\*.*?(\*/|\Z)'
+      Expression = '/\*{2,}'
       ColumnFrom = 0
       ColumnTo = 0
     end
     item
-      DisplayName = 'Comment doc end-only'
+      DisplayName = 'Comment doc end'
       StyleName = 'Comment doc'
+      StatesRemove = 1
+      StatesPresent = 1
       TokenType = 1
       Expression = '\*/'
       ColumnFrom = 0
@@ -957,8 +961,10 @@ object SyntAnal9: TLibSyntAnalyzer
     end
     item
       DisplayName = 'JSDoc'
+      StatesAdd = 1
+      StatesRemove = 1
       StartExpression = '/\*{2,}(?!/)'
-      EndExpression = '[^/\*\n\r]*?\*/'
+      EndExpression = '\*/'
       SyntAnalyzer = SyntAnal10
     end>
   SampleText.Strings = (