@@ -1,6 +1,6 @@

 /* Localized versions of Info.plist keys */

-CFBundleName = "Lisp Metadata Importer";

-CFBundleShortVersionString = "0.0.2";

-CFBundleGetInfoString = "Lisp Metadata Importer version 0.0.1, Copyright (c) 2005 John Wiseman (jjwiseman@yahoo.com)";

-NSHumanReadableCopyright = "Copyright (c) 2005 John Wiseman (jjwiseman@yahoo.com)";

+CFBundleName = "tree-sitter-metadata-importer";

+CFBundleShortVersionString = "0.0.3";

+CFBundleGetInfoString = "Tree Sitter Metadata Importer version 0.0.1, Copyright (c) 2020 Ed L";

+NSHumanReadableCopyright = "Copyright (c) 2020 Ed L";

@@ -1,17 +1,11 @@

-"org_lisp_definitions" = "Lisp Definitions";

-"org_lisp_defuns" = "Lisp Defuns";

-"org_lisp_defmethods" = "Lisp Defmethods";

-"org_lisp_defgenerics" = "Lisp Defgenerics";

-"org_lisp_defmacros" = "Lisp Defmacros";

-"org_lisp_defvars" = "Lisp Defvars";

-"org_lisp_defclasses" = "Lisp Defclasses";

-"org_lisp_defstructs" = "Lisp Defstructs";

+"co_fwoar_java_classes" = "Java Classes";

+"co_fwoar_java_methods" = "Java Methods";

+"co_fwoar_java_interfaces" = "Java Interfaces";

+"co_fwoar_java_definitions" = "Java Definitions";

+"co_fwoar_java_package" = "Java Package";

-"org_lisp_definitions.Description" = "Functions, classes structs and other objects defined in a Lisp file";

-"org_lisp_defuns.Description" = "Functions defined in a Lisp file";

-"org_lisp_defmethods.Description" = "Methods defined in a Lisp file";

-"org_lisp_defgenerics.Description" = "Generic functions defined in a Lisp file";

-"org_lisp_defmacros.Description" = "Macros defined in a Lisp file";

-"org_lisp_defvars.Description" = "Variables, parameters and constants defined in a Lisp file";

-"org_lisp_defclasses.Description" = "Classes defined in a Lisp file";

-"org_lisp_defstructs.Description" = "Structures defined in a Lisp file";

+"co_fwoar_java_methods.Description" = "Methods in a Java file";

+"co_fwoar_java_interfaces.Description" = "Interfaces in a Java file";

+"co_fwoar_java_definitions.Description" = "Definitions in a Java file";

+"co_fwoar_java_classes.Description" = "Classes in a Java file";

+"co_fwoar_java_package.Description" = "Package for a Java file";

@@ -11,20 +11,22 @@

 			<string>MDImporter</string>

 			<key>LSItemContentTypes</key>

 			<array>

-				<string>org.lisp.lisp-source</string>

+				<string>com.sun.java-source</string>

 			</array>

 		</dict>

 	</array>

 	<key>CFBundleExecutable</key>

-	<string>Lisp Metadata Importer</string>

+	<string>tree-sitter-metadata-importer</string>

 	<key>CFBundleIconFile</key>

 	<string></string>

 	<key>CFBundleIdentifier</key>

 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>

 	<key>CFBundleInfoDictionaryVersion</key>

 	<string>6.0</string>

-	<key>CFBundleVersion</key>

+	<key>CFBundleShortVersionString</key>

 	<string>0.0.2</string>

+	<key>CFBundleVersion</key>

+	<string>1</string>

 	<key>CFPlugInDynamicRegisterFunction</key>

 	<string></string>

 	<key>CFPlugInDynamicRegistration</key>

@@ -5,21 +5,17 @@

     xsi:schemaLocation="http://www.apple.com/metadata file:///System/Library/Frameworks/CoreServices.framework/Frameworks/Metadata.framework/Resources/MetadataSchema.xsd">

     <attributes>

-        <attribute name="org_lisp_definitions" multivalued="true" type="CFString"/>

-        <attribute name="org_lisp_defuns" multivalued="true" type="CFString"/>

-        <attribute name="org_lisp_defmethods" multivalued="true" type="CFString"/>

-        <attribute name="org_lisp_defpackages" multivalued="true" type="CFString"/>

-        <attribute name="org_lisp_defgenerics" multivalued="true" type="CFString"/>

-        <attribute name="org_lisp_defmacros" multivalued="true" type="CFString"/>

-        <attribute name="org_lisp_defvars" multivalued="true" type="CFString"/>

-        <attribute name="org_lisp_defclasses" multivalued="true" type="CFString"/>

-        <attribute name="org_lisp_defstructs" multivalued="true" type="CFString"/>

+        <attribute name="co_fwoar_java_package" multivalued="false" type="CFString"/>

+        <attribute name="co_fwoar_java_classes" multivalued="true" type="CFString"/>

+        <attribute name="co_fwoar_java_interfaces" multivalued="true" type="CFString"/>

+        <attribute name="co_fwoar_java_methods" multivalued="true" type="CFString"/>

+        <attribute name="co_fwoar_java_definitions" multivalued="true" type="CFString"/>

     </attributes>

     <types>

-        <type name="org.lisp.lisp-source">

-            <allattrs>kMDItemTextContent org_lisp_definitions org_lisp_defuns org_lisp_defmethods org_lisp_defgenerics org_lisp_defmacros org_lisp_defvars org_lisp_defclasses org_lisp_defstructs</allattrs>

-            <displayattrs>org_lisp_defpackages org_lisp_defclasses org_lisp_defgenerics org_lisp_defuns org_lisp_defmacros</displayattrs>

+        <type name="com.sun.java-source">

+            <allattrs>kMDItemTextContent co_fwoar_java_package co_fwoar_java_classes co_fwoar_java_interfaces co_fwoar_java_methods co_fwoar_java_definitions</allattrs>

+            <displayattrs>co_fwoar_java_package co_fwoar_java_classes co_fwoar_java_interfaces</displayattrs>

         </type>

     </types>

 </schema>

@@ -22,7 +22,7 @@

 // "Private" methods.

 - (void)initStaticData;

-- (BOOL)addMatchesTo:(NSMutableDictionary *)attributes fromLine:(NSString *)line usingRE:(NSRegularExpression *)regex forKey:(NSString *)key;

+- (BOOL)addMatchesTo:(NSMutableDictionary *)attributes fromCString:(const char *)inp forKey:(NSString *)key;

 - (NSString*)readContentsOfFile:(NSString*)path error:(NSError**)theError;

 @end

@@ -13,6 +13,9 @@

 #import "NSString_HMext.h"

 #import "NSData_HMext.h"

 #import "DebugLog.h"

+#include "tree_sitter/api.h"

+#include "tree-sitter/lib/src/lib.c"

+#include "tree-sitter-java/src/parser.c"

 @implementation CMetadataImporter

@@ -24,57 +27,51 @@ long NO_MAXIMUM = -1;

 // All sorts of static data that we initialize once, then use many many times.

 static BOOL StaticDataIsInitialized = NO;

+static const TSLanguage* ts_language_java;

+char* package_query_str = "(package_declaration (scoped_identifier) @package)";

+TSQuery *package_query;

-// Lots of regexes in string form, waiting to be compiled.

+char* class_query_str = "(class_declaration name: (identifier) @class)";

+TSQuery* class_query;

-static NSString *LispDef1_pat = @"(?i)^\\(def[^\\s]*[\\s\\']+(\\(setf\\s+[^\\s]+\\))";

-static NSRegularExpression *LispDef1_RE = nil;

+char* interface_query_str = "(interface_declaration name: (identifier) @interface)";

+TSQuery* interface_query;

-static NSString *LispDef2_pat = @"(?i)^\\(def[^\\s]*[\\s\\']+([^\\s\\)]+)";

-static NSRegularExpression *LispDef2_RE = nil;

-

-static NSString *LispDefun_pat = @"(?i)^\\(defun\\s+([^\\s\\)\\(]+)";

-static NSRegularExpression *LispDefun_RE = nil;

-

-static NSString *LispDefunsetf_pat = @"(?i)^\\(defun\\s+(\\(setf\\s+[^\\s]+\\))";

-static NSRegularExpression *LispDefunsetf_RE = nil;

-

-static NSString *LispDefmethod_pat = @"(?i)^\\(defmethod\\s+([^\\s\\)\\(]+)";

-static NSRegularExpression *LispDefmethod_RE = nil;

-

-static NSString *LispDefmethodsetf_pat = @"(?i)^\\(defmethod\\s+(\\(setf\\s+[^\\s]+\\))";

-static NSRegularExpression *LispDefmethodsetf_RE = nil;

-

-static NSString *LispDefgeneric_pat = @"(?i)^\\(defgeneric\\s+((?:[^\\s\\)\\(]+|\\(setf\\s+[^\\s]+\\)))";

-static NSRegularExpression *LispDefgeneric_RE = nil;

-

-static NSString *LispDefgenericsetf_pat = @"(?i)^\\(defgeneric\\s+(\\(setf\\s+[^\\s]+\\))";

-static NSRegularExpression *LispDefgenericsetf_RE = nil;

-

-static NSString *LispDefmacro_pat = @"(?i)^\\(defmacro\\s+([^\\s\\)]+)";

-static NSRegularExpression *LispDefmacro_RE = nil;

-

-static NSString *LispDefclass_pat = @"(?i)^\\(defclass\\s+([^\\s\\)]+)";

-static NSRegularExpression *LispDefclass_RE = nil;

-

-static NSString *LispDefstruct_pat = @"(?i)^\\(defstruct\\s+\\(?([^\\s\\)]+)";

-static NSRegularExpression *LispDefstruct_RE = nil;

-

-static NSString *LispDefvar_pat = @"(?i)^\\((?:defvar|defparameter|defconstant)\\s+([^\\s\\)]+)";

-static NSRegularExpression *LispDefvar_RE = nil;

-

-static NSError *err = nil;

+char* method_query_str = "(class_declaration name: (identifier) @class body: (class_body (method_declaration name: (identifier) @method (formal_parameters) @type)))(interface_declaration name: (identifier) @interface body: (interface_body (method_declaration name: (identifier) @method (formal_parameters) @type)))";

+TSQuery* method_query;

+//static TSQuery method_query;

+//static TSQuery field_query;

+//

+//static NSError *err = nil;

 - (void)initStaticData

 {

-    NSLog(@"Import Lisp");

     if (StaticDataIsInitialized)

     {

         return;

     }

-    

     StaticDataIsInitialized = YES;

+    uint32_t error_offset;

+    TSQueryError error_type;

+    

+    method_query = ts_query_new(ts_language_java, method_query_str, (uint32_t)strlen(method_query_str), &error_offset, &error_type);

+    if (error_type != 0) {

+        NSLog(@"error while initializing method query offset: %d, type: %d", error_offset, error_type);

+    }

+    interface_query = ts_query_new(ts_language_java, interface_query_str, (uint32_t)strlen(interface_query_str), &error_offset, &error_type);

+    if (error_type != 0) {

+        NSLog(@"error while initializing interface query offset: %d, type: %d", error_offset, error_type);

+    }

+    class_query = ts_query_new(ts_language_java, class_query_str, (uint32_t)strlen(class_query_str), &error_offset, &error_type);

+    if (error_type != 0) {

+        NSLog(@"error while initializing class query offset: %d, type: %d", error_offset, error_type);

+    }

+    package_query = ts_query_new(ts_language_java, package_query_str, (uint32_t)strlen(package_query_str), &error_offset, &error_type);

+    if (error_type != 0) {

+        NSLog(@"error while initializing package query offset: %d type: %d", error_offset, error_type);

+    }

+

     // Find the bundle, and Info.plist.  Set the debug level specified

     // there, as well as the maximum file length to index.

     NSBundle *theBundle = [NSBundle bundleForClass:[self class]];

@@ -98,42 +95,6 @@ static NSError *err = nil;

     }

     // Precompile our regexes.

-    LispDef1_RE = [NSRegularExpression regularExpressionWithPattern:LispDef1_pat

-                                                            options:NSRegularExpressionCaseInsensitive

-                                                              error:&err];

-    LispDef2_RE = [NSRegularExpression regularExpressionWithPattern:LispDef2_pat

-                                                            options:NSRegularExpressionCaseInsensitive

-                                                              error:&err];

-    LispDefun_RE = [NSRegularExpression regularExpressionWithPattern:LispDefun_pat

-                                                             options:NSRegularExpressionCaseInsensitive

-                                                               error:&err];

-    LispDefunsetf_RE = [NSRegularExpression regularExpressionWithPattern:LispDefunsetf_pat

-                                                                 options:NSRegularExpressionCaseInsensitive

-                                                                   error:&err];

-    LispDefmethod_RE = [NSRegularExpression regularExpressionWithPattern:LispDefmethod_pat

-                                                                 options:NSRegularExpressionCaseInsensitive

-                                                                   error:&err];

-    LispDefmethodsetf_RE = [NSRegularExpression regularExpressionWithPattern:LispDefmethodsetf_pat

-                                                                     options:NSRegularExpressionCaseInsensitive

-                                                                       error:&err];

-    LispDefgeneric_RE = [NSRegularExpression regularExpressionWithPattern:LispDefgeneric_pat

-                                                                  options:NSRegularExpressionCaseInsensitive

-                                                                    error:&err];

-    LispDefgenericsetf_RE = [NSRegularExpression regularExpressionWithPattern:LispDefgenericsetf_pat

-                                                                      options:NSRegularExpressionCaseInsensitive

-                                                                        error:&err];

-    LispDefclass_RE = [NSRegularExpression regularExpressionWithPattern:LispDefclass_pat

-                                                                options:NSRegularExpressionCaseInsensitive

-                                                                  error:&err];

-    LispDefstruct_RE = [NSRegularExpression regularExpressionWithPattern:LispDefstruct_pat

-                                                                 options:NSRegularExpressionCaseInsensitive

-                                                                   error:&err];

-    LispDefvar_RE = [NSRegularExpression regularExpressionWithPattern:LispDefvar_pat

-                                                              options:NSRegularExpressionCaseInsensitive

-                                                                error:&err];

-    LispDefmacro_RE = [NSRegularExpression regularExpressionWithPattern:LispDefmacro_pat

-                                                                options:NSRegularExpressionCaseInsensitive

-                                                                  error:&err];

     DebugLog(DEBUG_LEVEL_DEBUG, @"Static data has been initialized.");

 }

@@ -206,28 +167,38 @@ static NSStringEncoding PossibleSourceTextEncodings[] = {	NSUTF8StringEncoding,

 // Adds metadata values to the specified dictionary under the

 // specified key, using the specified regular expression.

-- (BOOL)addMatchesTo:(NSMutableDictionary *)attributes fromLine:(NSString *)line usingRE:(NSRegularExpression *)regex forKey:(NSString *)key

+- (BOOL)addMatchesTo:(NSMutableDictionary *)attributes fromCString:(const char *)inp forKey:(NSString *)key

 {

-    NSTextCheckingResult *match = [regex firstMatchInString:line options:NSMatchingAnchored range:NSMakeRange(0, [line length])];

-    if (match)

-    {

-        NSLog(@"%s", [line UTF8String]);

-        NSString *name = [line substringWithRange: [match rangeAtIndex:1]];

-        [[attributes objectForKey:key] addObject:name];

-        return YES;

-    }

-    else

-    {

-        return NO;

+    NSString* match = [NSString stringWithUTF8String:inp];

+    if (![[attributes objectForKey:key] containsObject:match]) {

+        [[attributes objectForKey:key] addObject:match];

     }

+    return YES;

 }

 // This is the method that does all the importing and indexing work.

 // It stuffs attributes into the specified dictionary.

-

 - (BOOL)importFile:(NSString *)inPathToFile contentType:(NSString *)inContentType attributes:(NSMutableDictionary *)inAttributes

 {

+    TSParser* ts_parser;

+    

+    char *packagename_buf = 0;

+    char* classname_buf = 0;

+    char* interfacename_buf = 0;

+    char* methodname_buf = 0;

+

+//    char* package_query_str = "(program (package_declaration (scoped_identifier) @package))";

+//    TSQuery* package_query;

+

+    

+    ts_parser = ts_parser_new();

+    ts_language_java = tree_sitter_java();

+    ts_parser_set_language(ts_parser, ts_language_java);

+    

+    TSQueryCursor *class_cursor = ts_query_cursor_new();

+    TSQueryCursor *package_cursor = ts_query_cursor_new();

+

     BOOL theResult = NO;

     @try

@@ -250,6 +221,8 @@ static NSStringEncoding PossibleSourceTextEncodings[] = {	NSUTF8StringEncoding,

                 NSLog(@"Lisp Metadata Importer: Could not process file '%@': unknown error", inPathToFile);

             }	

             return NO;

+        } else {

+            NSLog(@"Processing file '%@'", inPathToFile);

         }

         // Only process the first MaxSourceSize of the file.  To try to do more

@@ -259,46 +232,126 @@ static NSStringEncoding PossibleSourceTextEncodings[] = {	NSUTF8StringEncoding,

             source = [source substringToIndex:MaxSourceSize];

         }

-        NSMutableDictionary *moreAttributes = [[[NSMutableDictionary alloc] initWithCapacity:10] autorelease];

-        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"org_lisp_definitions"];

-        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"org_lisp_defuns"];

-        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"org_lisp_defmethods"];

-        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"org_lisp_defgenerics"];

-        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"org_lisp_defmacros"];

-        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"org_lisp_defvars"];

-        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"org_lisp_defclasses"];

-        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"org_lisp_defstructs"];

+        const char *cstring_source = [source UTF8String];

+        TSTree *tree = ts_parser_parse_string(ts_parser, NULL, cstring_source, strlen(cstring_source));

+        TSNode root_node = ts_tree_root_node(tree);

-        // Divide the file contents into lines, using either CR or LF to end a line.

-        NSCharacterSet *eol = [NSCharacterSet characterSetWithCharactersInString:@"\n\r"];

-        NSArray *lines = [source componentsSeparatedByCharacterFromSet:eol];

+        NSMutableDictionary *moreAttributes = [[[NSMutableDictionary alloc] initWithCapacity:4] autorelease];

-        NSEnumerator *theEnum = [lines objectEnumerator];

-        NSString *theLine;

+        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"co_fwoar_java_package"];

+        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"co_fwoar_java_classes"];

+        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"co_fwoar_java_interfaces"];

+        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"co_fwoar_java_methods"];

+        [moreAttributes setObject:[NSMutableArray arrayWithCapacity:100] forKey:@"co_fwoar_java_definitions"];

-        while (nil != (theLine = [theEnum nextObject]))

-        {

-            // The following check speeds the indexer up by roughly 6x.

-            if (([theLine length] > 0) && ([theLine characterAtIndex:0] == '('))

-            {

-                if (![self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDef1_RE forKey:@"org_lisp_definitions"])

-                {

-                    // The first expression didn't fire, try the second one.

-                    [self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDef2_RE forKey:@"org_lisp_definitions"];

+        ts_query_cursor_exec(package_cursor, package_query, root_node);

+        uint32_t packagename_start, packagename_end, packagename_length;

+        

+        TSQueryMatch ts_match;

+        if (ts_query_cursor_next_match(package_cursor, &ts_match)) {

+            packagename_start = ts_node_start_byte(ts_match.captures[0].node);

+            packagename_end = ts_node_end_byte(ts_match.captures[0].node);

+            packagename_length = packagename_end - packagename_start;

+            packagename_buf = calloc(1 + packagename_length, sizeof(char));

+            if (packagename_buf) {

+                strncpy(packagename_buf, cstring_source + packagename_start, packagename_length);

+                [self addMatchesTo:moreAttributes fromCString: packagename_buf forKey:@"co_fwoar_java_package"];

+            } else {

+                goto fail;

+            }

+        }

+        

+        ts_query_cursor_exec(class_cursor, class_query, root_node);

+        while (ts_query_cursor_next_match(class_cursor, &ts_match)) {

+            if (ts_match.captures) {

+                uint32_t classname_start = ts_node_start_byte(ts_match.captures[0].node);

+                uint32_t classname_end = ts_node_end_byte(ts_match.captures[0].node);

+                uint32_t classname_length = classname_end - classname_start;

+                if (classname_buf) {

+                    free(classname_buf);

+                }

+                classname_buf = calloc(1 + (packagename_length + 1 + classname_length), sizeof(char));

+                if (classname_buf) {

+                    strncpy(classname_buf, cstring_source + packagename_start, packagename_length);

+                    classname_buf[packagename_length] = '.';

+                    strncpy(classname_buf + packagename_length + 1, cstring_source + classname_start, classname_length);

+                    [self addMatchesTo:moreAttributes fromCString: classname_buf forKey:@"co_fwoar_java_classes"];

+                    [self addMatchesTo:moreAttributes fromCString: classname_buf forKey:@"co_fwoar_java_definitions"];

+                } else {

+                    goto fail;

+                }

+            }

+        }

+        

+        ts_query_cursor_exec(class_cursor, interface_query, root_node);

+        while (ts_query_cursor_next_match(class_cursor, &ts_match)) {

+            if (ts_match.captures) {

+                uint32_t interfacename_start = ts_node_start_byte(ts_match.captures[0].node);

+                uint32_t interfacename_end = ts_node_end_byte(ts_match.captures[0].node);

+                uint32_t interfacename_length = interfacename_end - interfacename_start;

+                if (interfacename_buf) {

+                    free(interfacename_buf);

+                }

+                interfacename_buf = calloc(1 + (packagename_length + 1 + interfacename_length), sizeof(char));

+                if (interfacename_buf) {

+                    strncpy(interfacename_buf, cstring_source + packagename_start, packagename_length);

+                    interfacename_buf[packagename_length] = '.';

+                    strncpy(interfacename_buf + packagename_length + 1, cstring_source + interfacename_start, interfacename_length);

+                    [self addMatchesTo:moreAttributes fromCString: interfacename_buf forKey:@"co_fwoar_java_interfaces"];

+                    [self addMatchesTo:moreAttributes fromCString: interfacename_buf forKey:@"co_fwoar_java_definitions"];

+                } else {

+                    goto fail;

+                }

+            }

+        }

+        

+        ts_query_cursor_exec(class_cursor, method_query, root_node);

+        while (ts_query_cursor_next_match(class_cursor, &ts_match)) {

+            if (ts_match.captures) {

+                uint32_t classname_start = ts_node_start_byte(ts_match.captures[0].node);

+                uint32_t classname_end = ts_node_end_byte(ts_match.captures[0].node);

+                uint32_t classname_length = classname_end - classname_start;

+

+                uint32_t methodname_start = ts_node_start_byte(ts_match.captures[1].node);

+                uint32_t methodname_end = ts_node_end_byte(ts_match.captures[1].node);

+                uint32_t methodname_length = methodname_end - methodname_start;

+                if (methodname_buf) {

+                    free(methodname_buf);

+                }

+                methodname_buf = calloc(1 + (packagename_length + 1 + classname_length + 1 + methodname_length), sizeof(char));

+                if (methodname_buf) {

+                    strncpy(methodname_buf, cstring_source + packagename_start, packagename_length);

+                    methodname_buf[packagename_length] = '.';

+                    strncpy(methodname_buf + packagename_length + 1, cstring_source + classname_start, classname_length);

+                    methodname_buf[packagename_length + 1 + classname_length] = '.';

+                    strncpy(methodname_buf + packagename_length + 1 + classname_length + 1, cstring_source + methodname_start, methodname_length);

+                    // "((n+1)*m-1)

+                    uint32_t cur_offset = strlen(methodname_buf);

+                    uint32_t total_length = strlen(methodname_buf) + 1 /*null*/;

+                    for (uint16_t next = 2; next < ts_match.capture_count; next++) {

+                      uint32_t capture_start = ts_node_start_byte(ts_match.captures[next].node);

+                      uint32_t capture_end = ts_node_end_byte(ts_match.captures[next].node);

+                      uint32_t capture_length = capture_end - capture_start;

+                      total_length += capture_length;

+                    }

+                    methodname_buf = realloc(methodname_buf, total_length * sizeof(char));

+                    methodname_buf[total_length - 1] = '\0';

+

+                    for (uint16_t next = 2; next < ts_match.capture_count; next++) {

+                      uint32_t capture_start = ts_node_start_byte(ts_match.captures[next].node);

+                      uint32_t capture_end = ts_node_end_byte(ts_match.captures[next].node);

+                      uint32_t capture_length = capture_end - capture_start;

+                      strncpy(methodname_buf + cur_offset, cstring_source + capture_start, capture_length);

+                      cur_offset += capture_length;

+                    }

+                    if (cur_offset+1 != total_length) { NSLog(@"Something is wrong :( %u != %u", cur_offset+1, total_length); }

+                    [self addMatchesTo:moreAttributes fromCString: methodname_buf forKey:@"co_fwoar_java_methods"];

+                    [self addMatchesTo:moreAttributes fromCString: methodname_buf forKey:@"co_fwoar_java_definitions"];

+                } else {

+                    goto fail;

                 }

-                [self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDefun_RE forKey:@"org_lisp_defuns"];

-                [self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDefunsetf_RE forKey:@"org_lisp_defuns"];

-                [self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDefmethod_RE forKey:@"org_lisp_defmethods"];

-                [self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDefmethodsetf_RE forKey:@"org_lisp_defmethods"];

-                [self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDefgeneric_RE forKey:@"org_lisp_defgenerics"];

-                [self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDefgenericsetf_RE forKey:@"org_lisp_defgenerics"];

-                [self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDefmacro_RE forKey:@"org_lisp_defmacros"];

-                [self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDefvar_RE forKey:@"org_lisp_defvars"];

-                [self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDefclass_RE forKey:@"org_lisp_defclasses"];

-                [self addMatchesTo:moreAttributes fromLine:theLine usingRE:LispDefstruct_RE forKey:@"org_lisp_defstructs"];

             }

-            

         }

         // Add the complete source code as metadata.

@@ -306,14 +359,30 @@ static NSStringEncoding PossibleSourceTextEncodings[] = {	NSUTF8StringEncoding,

         [inAttributes addEntriesFromDictionary:moreAttributes];

         theResult = YES;

+    fail:

         [theAutoreleasePool release];

     }

     @catch (NSException *localException)

     {

-        NSLog(@"Lisp Metadata Importer: Could not process file '%@' (Exception: %@)", inPathToFile, localException);

+        NSLog(@"Tree Sitter (java) Metadata Importer: Could not process file '%@' (Exception: %@)", inPathToFile, localException);

     }

     @finally

     {

+        ts_query_cursor_delete(class_cursor);

+        ts_query_cursor_delete(package_cursor);

+        if (packagename_buf) {

+            free(packagename_buf);

+        }

+        if (classname_buf) {

+            free(classname_buf);

+        }

+        if (interfacename_buf) {

+            free(interfacename_buf);

+        }

+        if (methodname_buf) {

+            free(methodname_buf);

+        }

+        ts_parser_delete(ts_parser);

     }

     return(theResult);

 }

new file mode 120000

@@ -0,0 +1 @@

+../Source/tree-sitter/lib/include/tree_sitter

\ No newline at end of file

new file mode 120000

@@ -0,0 +1 @@

+../Source/tree-sitter/lib/src/unicode/

\ No newline at end of file