Fix two bugs, bump bugfix version

divvun · May 4, 2021 · 52030be · 52030be
1 parent a4f0133
commit 52030be
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/LexC.seemode/Contents/Info.plist b/LexC.seemode/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>2.5.0, ©The Divvun Group at UiT 2007-2021, http://divvun.no/</string>
+	<string>2.5.1, ©The Divvun Group at UiT 2007-2021, http://divvun.no/</string>
 	<key>CFBundleIdentifier</key>
 	<string>SEEMode.LexC</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -13,9 +13,9 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
+	<string>2.5.1</string>
 	<key>CFBundleVersion</key>
-	<string>2.5.0</string>
+	<string>2.5.1</string>
 	<key>SEEMinimumEngineVersion</key>
 	<string>4.0</string>
 </dict>

diff --git a/LexC.seemode/Contents/Resources/ChangeLog.txt b/LexC.seemode/Contents/Resources/ChangeLog.txt
@@ -1,3 +1,7 @@
+Changes with Version 2.5.1
+    *) Bugfix: allow no space between CONTLEX and ; for colouring the lemma
+    *) Bugfix: stop comment colouring at the end of the line even when ! is the only comment char
+
 Changes with Version 2.5.0
     *) New feature: rudimentary support for Markdown syntax in doccomments
     *) Improvement: better/more distinct colours

diff --git a/LexC.seemode/Contents/Resources/SyntaxDefinition.xml b/LexC.seemode/Contents/Resources/SyntaxDefinition.xml
@@ -97,7 +97,7 @@
 
             <!-- % can be followed by: "*~ etc, add any missing symbol to the lists below: -->
             <keywords id="Upper" scope="language.constant">
-                <regex>^\s*(.+?)[:+].*?\s+\S*(?: ".*")? ;</regex>
+                <regex>^\s*(.+?)[:+].*?\s+\S*(?: ".*")?\s*;</regex>
             </keywords>
 
             <keywords id="UpperLower" scope="language.constant">
@@ -144,7 +144,7 @@
             </keywords>
 
             <state id="Comment" scope="comment.line">
-                <begin><regex>![^!]</regex></begin>
+                <begin><regex>![^!\n\r]?</regex></begin>
                 <end><regex>[\n\r]</regex></end>
                 <import mode="Base" state="EmailAndURLContainerState" keywords-only="yes"/>
             </state>
@@ -173,7 +173,7 @@
                 <end><regex>(((?&lt;!\\)(\\\\)*)|^)LEXICON</regex></end>
 
                 <state id="CommentInMC" scope="comment.line">
-                    <begin><regex>![^!]</regex></begin>
+                    <begin><regex>![^!\n\r]?</regex></begin>
                     <end><regex>[\n\r]</regex></end>
                 </state>