Build with Xcode 13.4. Update JSON

Author: krzyzanowskim

Sources/tree_sitter_language_resources/LanguageResources/java/highlights.scm

@@ -112,6 +112,7 @@
   "module"
   "native"
   "new"
+  "non-sealed"
   "open"
   "opens"
   "package"
@@ -121,6 +122,7 @@
   "public"
   "requires"
   "return"
+  "sealed"
   "static"
   "strictfp"
   "switch"

Sources/tree_sitter_language_resources/LanguageResources/java/tags.scm

@@ -11,7 +11,7 @@
 (interface_declaration
   name: (identifier) @name) @definition.interface
 
-(interface_type_list
+(type_list
   (type_identifier) @name) @reference.implementation
 
 (object_creation_expression

Sources/tree_sitter_language_resources/LanguageResources/json/highlights.scm

@@ -1,9 +1,16 @@
 (pair
-  key: (_) @keyword)
+  key: (_) @string.special.key)
 
 (string) @string
 
-(object
-  "{" @escape
-  (_)
-  "}" @escape)
+(number) @number
+
+[
+  (null)
+  (true)
+  (false)
+] @constant.builtin
+
+(escape_sequence) @escape
+
+(comment) @comment

Sources/tree_sitter_language_resources/LanguageResources/swift/highlights.scm

@@ -27,7 +27,7 @@
 (type_parameter (type_identifier) @parameter)
 (inheritance_constraint (identifier (simple_identifier) @parameter))
 (equality_constraint (identifier (simple_identifier) @parameter))
-(non_binding_pattern bound_identifier: (simple_identifier)) @variable
+(pattern bound_identifier: (simple_identifier)) @variable
 
 [
   "typealias"
@@ -46,8 +46,8 @@
   (modify_specifier)
 ] @keyword
 
-(class_body (property_declaration (value_binding_pattern (non_binding_pattern (simple_identifier) @property))))
-(protocol_property_declaration (value_binding_pattern (non_binding_pattern (simple_identifier) @property)))
+(class_body (property_declaration (pattern (simple_identifier) @property)))
+(protocol_property_declaration (pattern (simple_identifier) @property))
 
 (import_declaration ["import" @include])
 
@@ -75,7 +75,6 @@
 ["while" "repeat" "continue" "break"] @repeat
 
 ["let" "var"] @keyword
-(non_binding_pattern (simple_identifier) @variable)
 
 (guard_statement ["guard" @conditional])
 (if_statement ["if" @conditional])

scripts/build-tree-sitter.sh

@@ -14,7 +14,7 @@ IPHONESIMULATOR_SYSROOT=$(xcrun --sdk iphonesimulator --show-sdk-path)
 
 MACOS_COMMON_FLAGS="-arch arm64 -arch x86_64 -mmacosx-version-min=10.13"
 IPHONEOS_COMMON_FLAGS="-arch arm64 -miphoneos-version-min=11.0 -fembed-bitcode -isysroot $IPHONEOS_SYSROOT"
-MACCATALYST_COMMON_FLAGS="-arch arm64 -arch x86_64 -target x86_64-apple-ios-macabi -fembed-bitcode -miphoneos-version-min=13.0"
+MACCATALYST_COMMON_FLAGS="-arch arm64 -arch x86_64 -target x86_64-apple-ios-macabi -fembed-bitcode -miphoneos-version-min=14.0"
 IPHONESIMULATOR_COMMON_FLAGS="-arch arm64 -arch x86_64 -miphonesimulator-version-min=11.0 -isysroot $IPHONESIMULATOR_SYSROOT"
 
 pushd $TMP_BUILD_DIR
@@ -139,7 +139,6 @@ build_parser "python"
 
 git clone --depth 1 https://github.com/tree-sitter/tree-sitter-html.git
 pushd tree-sitter-html
-gh pr checkout 38
 popd
 build_parser "html"
 

tree_sitter.xcframework/Info.plist

@@ -6,7 +6,7 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>tree_sitter.framework</string>
 			<key>SupportedArchitectures</key>
@@ -15,11 +15,13 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>tree_sitter.framework</string>
 			<key>SupportedArchitectures</key>
@@ -28,36 +30,34 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>tree_sitter.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>tree_sitter.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>maccatalyst</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>