fix beautifier with URI

Build/Components/4DPop Macros.4dbase/Info.plist

@@ -6,15 +6,15 @@
     <key>CFBundleName</key>
     <string>4DPop Macros</string>
     <key>CFBundleVersion</key>
-    <string>281</string>
+    <string>282</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2009-2024</string>
     <key>CFBundleGetInfoString</key>
-    <string>20R5</string>
+    <string>20R6</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R5 (280)</string>
+    <string>20R6 (281)</string>
     <key>CFBundleShortVersionString</key>
-    <string>20R5</string>
+    <string>20R6</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop Macros</string>
   </dict>

Info.plist

@@ -6,15 +6,15 @@
     <key>CFBundleName</key>
     <string>4DPop Macros</string>
     <key>CFBundleVersion</key>
-    <string>281</string>
+    <string>282</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2009-2024</string>
     <key>CFBundleGetInfoString</key>
-    <string>20R5</string>
+    <string>20R6</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R5 (280)</string>
+    <string>20R6 (281)</string>
     <key>CFBundleShortVersionString</key>
-    <string>20R5</string>
+    <string>20R6</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop Macros</string>
   </dict>

Project/4DPop Macros.4DProject

@@ -1,3 +1,4 @@
 {
-	"$comment": "The project file let you override the location for most folders"
-}
+	"$comment": "The project file let you override the location for most folders",
+	"$4DPopAppMakerToolVersion": "20R6"
+}

Project/Sources/Classes/beautifier.4dm

@@ -70,7 +70,8 @@ Class constructor()
 		EndForEach: Replace string:C233($t; "{control}"; This:C1470._controls.endForEach); \
 		CaseOfItem: "(?<!"+kCommentMark+")\\r*(\\r:\\s\\([^\\r]*\\r)\\r*"; \
 		BeginSQL: "(?<!"+kCommentMark+")^(?:/\\*.*\\*/)?"+Command name:C538(948); \
-		EndSQL: "(?<!"+kCommentMark+")^(?:/\\*.*\\*/)?"+Command name:C538(949)\
+		EndSQL: "(?<!"+kCommentMark+")^(?:/\\*.*\\*/)?"+Command name:C538(949); \
+		var: "(?mi-s)^var\\\\s*[^:]*)"\
 		}
 
 	This:C1470._patterns.closure:="(?<!"+kCommentMark+")(?:"+[\
@@ -533,8 +534,9 @@ Function beautify()
 		// Add a space before the comment and capitalize the first letter
 		If ($options.formatComments)\
 			 && (Position:C15(kCommentMark; $line)#0)\
-			 && (Position:C15(kCommentMark+"%"; $line)=0)\
-			 && Not:C34(This:C1470.rgx.setPattern(This:C1470._patterns.commentLine).match())
+			 && /* not compiler directive */(Position:C15(kCommentMark+"%"; $line)=0)\
+			 && /* not URI */Not:C34(This:C1470.rgx.setPattern("(?mi-s)\"[^:]*://").match())\
+			 && /* not separator line */Not:C34(This:C1470.rgx.setPattern(This:C1470._patterns.commentLine).match())
 
 			$line:=This:C1470._formatComment($line)
 

Project/Sources/Classes/declaration.4dm

@@ -58,7 +58,8 @@ Class constructor
 		varObject: Replace string:C233($t; "{type}"; "Object"); \
 		varClass: Replace string:C233($t; "{type}"; "(?:4d|cs)\\.\\w*"); \
 		varCollection: Replace string:C233($t; "{type}"; "Collection"); \
-		varVariant: Replace string:C233($t; "{type}"; "Variant")\
+		varVariant: Replace string:C233($t; "{type}"; "Variant"); \
+		varWithAssignment: "\"(?mi-s)^var\\\\s*(?:[^:]*:){2}=\""\
 		}
 
 	var $icon : Picture