Use wmap-parser-swift and tree-sitter-wmap for parsing and highlighting.

2 files changed, 136 insertions, 17 deletions

diff --git a/Map.xcodeproj/project.pbxproj b/Map.xcodeproj/project.pbxproj
index 020ce52..f19865e 100644
--- a/Map.xcodeproj/project.pbxproj
+++ b/Map.xcodeproj/project.pbxproj
@@ -14,6 +14,14 @@
 		B5282B122E210D4500C62006 /* MapQuickLook.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = B5282B022E210D4400C62006 /* MapQuickLook.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		B5282B3D2E21109C00C62006 /* Patterns in Frameworks */ = {isa = PBXBuildFile; productRef = B5282B3C2E21109C00C62006 /* Patterns */; };
 		B5282B3F2E21109C00C62006 /* ConcaveHull in Frameworks */ = {isa = PBXBuildFile; productRef = B5282B3E2E21109C00C62006 /* ConcaveHull */; };
+		B5C5921A2EEF0B0F000A31F5 /* WmapParser in Frameworks */ = {isa = PBXBuildFile; productRef = B5C592192EEF0B0F000A31F5 /* WmapParser */; };
+		B5C5921C2EEF1E67000A31F5 /* WmapParser in Frameworks */ = {isa = PBXBuildFile; productRef = B5C5921B2EEF1E67000A31F5 /* WmapParser */; };
+		B5C5921F2EEF4212000A31F5 /* TreeSitterWmap in Frameworks */ = {isa = PBXBuildFile; productRef = B5C5921E2EEF4212000A31F5 /* TreeSitterWmap */; };
+		B5C592212EEF4235000A31F5 /* TreeSitterWmap in Frameworks */ = {isa = PBXBuildFile; productRef = B5C592202EEF4235000A31F5 /* TreeSitterWmap */; };
+		B5C5922C2EEF4C22000A31F5 /* SwiftTreeSitter in Frameworks */ = {isa = PBXBuildFile; productRef = B5C5922B2EEF4C22000A31F5 /* SwiftTreeSitter */; };
+		B5C5922E2EEF4C22000A31F5 /* SwiftTreeSitterLayer in Frameworks */ = {isa = PBXBuildFile; productRef = B5C5922D2EEF4C22000A31F5 /* SwiftTreeSitterLayer */; };
+		B5C592302EEF4C2F000A31F5 /* SwiftTreeSitter in Frameworks */ = {isa = PBXBuildFile; productRef = B5C5922F2EEF4C2F000A31F5 /* SwiftTreeSitter */; };
+		B5C592322EEF4C2F000A31F5 /* SwiftTreeSitterLayer in Frameworks */ = {isa = PBXBuildFile; productRef = B5C592312EEF4C2F000A31F5 /* SwiftTreeSitterLayer */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -101,14 +109,6 @@
 				Business/SmartLabelPositioning/SmartLabelPositioning.swift,
 				Business/Stage.swift,
 				Business/Template.swift,
-				Business/WmapParser/Entity.swift,
-				Business/WmapParser/Lexer.swift,
-				Business/WmapParser/Parser.swift,
-				Business/WmapParser/SourcePosition.swift,
-				Business/WmapParser/Syntax.swift,
-				Business/WmapParser/Token.swift,
-				Business/WmapParser/TokenType.swift,
-				Business/WmapSyntaxHighlighter/SyntaxHighlighter.swift,
 				Data/UserPreferences.swift,
 				"Data/UTType+wmap.swift",
 				Localizable.xcstrings,
@@ -178,7 +178,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B5C5921C2EEF1E67000A31F5 /* WmapParser in Frameworks */,
 				B5282B052E210D4500C62006 /* Quartz.framework in Frameworks */,
+				B5C592212EEF4235000A31F5 /* TreeSitterWmap in Frameworks */,
+				B5C592302EEF4C2F000A31F5 /* SwiftTreeSitter in Frameworks */,
+				B5C592322EEF4C2F000A31F5 /* SwiftTreeSitterLayer in Frameworks */,
 				B5282B3D2E21109C00C62006 /* Patterns in Frameworks */,
 				B5282B3F2E21109C00C62006 /* ConcaveHull in Frameworks */,
 			);
@@ -188,7 +192,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B5C5921A2EEF0B0F000A31F5 /* WmapParser in Frameworks */,
 				B51A45F52C982FAE00870ED5 /* Sparkle in Frameworks */,
+				B5C5921F2EEF4212000A31F5 /* TreeSitterWmap in Frameworks */,
+				B5C5922C2EEF4C22000A31F5 /* SwiftTreeSitter in Frameworks */,
+				B5C5922E2EEF4C22000A31F5 /* SwiftTreeSitterLayer in Frameworks */,
 				B5012E742C9625E200AC4D68 /* Patterns in Frameworks */,
 				B5012E7F2C97315800AC4D68 /* ConcaveHull in Frameworks */,
 			);
@@ -268,6 +276,10 @@
 			packageProductDependencies = (
 				B5282B3C2E21109C00C62006 /* Patterns */,
 				B5282B3E2E21109C00C62006 /* ConcaveHull */,
+				B5C5921B2EEF1E67000A31F5 /* WmapParser */,
+				B5C592202EEF4235000A31F5 /* TreeSitterWmap */,
+				B5C5922F2EEF4C2F000A31F5 /* SwiftTreeSitter */,
+				B5C592312EEF4C2F000A31F5 /* SwiftTreeSitterLayer */,
 			);
 			productName = QuickLook;
 			productReference = B5282B022E210D4400C62006 /* MapQuickLook.appex */;
@@ -297,6 +309,10 @@
 				B5012E732C9625E200AC4D68 /* Patterns */,
 				B5012E7E2C97315800AC4D68 /* ConcaveHull */,
 				B51A45F42C982FAE00870ED5 /* Sparkle */,
+				B5C592192EEF0B0F000A31F5 /* WmapParser */,
+				B5C5921E2EEF4212000A31F5 /* TreeSitterWmap */,
+				B5C5922B2EEF4C22000A31F5 /* SwiftTreeSitter */,
+				B5C5922D2EEF4C22000A31F5 /* SwiftTreeSitterLayer */,
 			);
 			productName = Map;
 			productReference = B545870C2C961E9C0067B788 /* Map.app */;
@@ -382,6 +398,9 @@
 				B5012E722C9625E200AC4D68 /* XCRemoteSwiftPackageReference "patterns" */,
 				B5012E7D2C97315800AC4D68 /* XCRemoteSwiftPackageReference "ConcaveHull" */,
 				B51A45F32C982FAE00870ED5 /* XCRemoteSwiftPackageReference "Sparkle" */,
+				B5C592182EEF0B0F000A31F5 /* XCRemoteSwiftPackageReference "wmap-parser-swift" */,
+				B5C5921D2EEF4212000A31F5 /* XCRemoteSwiftPackageReference "tree-sitter-wmap" */,
+				B5C5922A2EEF4C22000A31F5 /* XCRemoteSwiftPackageReference "swift-tree-sitter" */,
 			);
 			preferredProjectObjectVersion = 60;
 			productRefGroup = B545870D2C961E9C0067B788 /* Products */;
@@ -483,7 +502,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = QuickLook/QuickLook.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 61;
+				CURRENT_PROJECT_VERSION = 70;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = QuickLook/Info.plist;
@@ -495,7 +514,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.5;
-				MARKETING_VERSION = 4.1.1;
+				MARKETING_VERSION = 4.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map.QuickLook;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -511,7 +530,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = QuickLook/QuickLook.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 61;
+				CURRENT_PROJECT_VERSION = 70;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = QuickLook/Info.plist;
@@ -523,7 +542,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.5;
-				MARKETING_VERSION = 4.1.1;
+				MARKETING_VERSION = 4.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map.QuickLook;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -666,7 +685,7 @@
 				CODE_SIGN_ENTITLEMENTS = Map/Map.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 69;
+				CURRENT_PROJECT_VERSION = 70;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Map/Preview Content\"";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -680,7 +699,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14;
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 4.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -699,7 +718,7 @@
 				CODE_SIGN_ENTITLEMENTS = Map/Map.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 69;
+				CURRENT_PROJECT_VERSION = 70;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Map/Preview Content\"";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -713,7 +732,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14;
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 4.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -866,6 +885,30 @@
 				minimumVersion = 2.6.4;
 			};
 		};
+		B5C592182EEF0B0F000A31F5 /* XCRemoteSwiftPackageReference "wmap-parser-swift" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://git.sr.ht/~rbdr/wmap-parser-swift";
+			requirement = {
+				branch = main;
+				kind = branch;
+			};
+		};
+		B5C5921D2EEF4212000A31F5 /* XCRemoteSwiftPackageReference "tree-sitter-wmap" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://git.sr.ht/~rbdr/tree-sitter-wmap";
+			requirement = {
+				branch = main;
+				kind = branch;
+			};
+		};
+		B5C5922A2EEF4C22000A31F5 /* XCRemoteSwiftPackageReference "swift-tree-sitter" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/tree-sitter/swift-tree-sitter";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.25.0;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -894,6 +937,46 @@
 			package = B5012E7D2C97315800AC4D68 /* XCRemoteSwiftPackageReference "ConcaveHull" */;
 			productName = ConcaveHull;
 		};
+		B5C592192EEF0B0F000A31F5 /* WmapParser */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B5C592182EEF0B0F000A31F5 /* XCRemoteSwiftPackageReference "wmap-parser-swift" */;
+			productName = WmapParser;
+		};
+		B5C5921B2EEF1E67000A31F5 /* WmapParser */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B5C592182EEF0B0F000A31F5 /* XCRemoteSwiftPackageReference "wmap-parser-swift" */;
+			productName = WmapParser;
+		};
+		B5C5921E2EEF4212000A31F5 /* TreeSitterWmap */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B5C5921D2EEF4212000A31F5 /* XCRemoteSwiftPackageReference "tree-sitter-wmap" */;
+			productName = TreeSitterWmap;
+		};
+		B5C592202EEF4235000A31F5 /* TreeSitterWmap */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B5C5921D2EEF4212000A31F5 /* XCRemoteSwiftPackageReference "tree-sitter-wmap" */;
+			productName = TreeSitterWmap;
+		};
+		B5C5922B2EEF4C22000A31F5 /* SwiftTreeSitter */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B5C5922A2EEF4C22000A31F5 /* XCRemoteSwiftPackageReference "swift-tree-sitter" */;
+			productName = SwiftTreeSitter;
+		};
+		B5C5922D2EEF4C22000A31F5 /* SwiftTreeSitterLayer */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B5C5922A2EEF4C22000A31F5 /* XCRemoteSwiftPackageReference "swift-tree-sitter" */;
+			productName = SwiftTreeSitterLayer;
+		};
+		B5C5922F2EEF4C2F000A31F5 /* SwiftTreeSitter */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B5C5922A2EEF4C22000A31F5 /* XCRemoteSwiftPackageReference "swift-tree-sitter" */;
+			productName = SwiftTreeSitter;
+		};
+		B5C592312EEF4C2F000A31F5 /* SwiftTreeSitterLayer */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B5C5922A2EEF4C22000A31F5 /* XCRemoteSwiftPackageReference "swift-tree-sitter" */;
+			productName = SwiftTreeSitterLayer;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = B54587042C961E9C0067B788 /* Project object */;
diff --git a/Map.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Map.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 8e294b8..519bc42 100644
--- a/Map.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Map.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "761de39b705b9793661607e3e8ffa75397e9772bccc8dc4c303ed42c76e874de",
+  "originHash" : "4db2597b88285f3511f8b59a0a29d034c4bf7642aed1bab0bdf0f4ec3479b739",
   "pins" : [
     {
       "identity" : "concavehull",
@@ -27,6 +27,42 @@
         "revision" : "0ef1ee0220239b3776f433314515fd849025673f",
         "version" : "2.6.4"
       }
+    },
+    {
+      "identity" : "swift-tree-sitter",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tree-sitter/swift-tree-sitter",
+      "state" : {
+        "revision" : "08ef81eb8620617b55b08868126707ad72bf754f",
+        "version" : "0.25.0"
+      }
+    },
+    {
+      "identity" : "tree-sitter",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tree-sitter/tree-sitter",
+      "state" : {
+        "revision" : "da6fe9beb4f7f67beb75914ca8e0d48ae48d6406",
+        "version" : "0.25.10"
+      }
+    },
+    {
+      "identity" : "tree-sitter-wmap",
+      "kind" : "remoteSourceControl",
+      "location" : "https://git.sr.ht/~rbdr/tree-sitter-wmap",
+      "state" : {
+        "branch" : "main",
+        "revision" : "c01881ae8910f11653e69d7bbded07e4413991bc"
+      }
+    },
+    {
+      "identity" : "wmap-parser-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://git.sr.ht/~rbdr/wmap-parser-swift",
+      "state" : {
+        "branch" : "main",
+        "revision" : "969b6a6653699b9f8662feb7f42511740f96f84a"
+      }
     }
   ],
   "version" : 3