feat: enhance Java method declaration parsing to include type information

Author: NaccOll

src/services/tree-sitter/index.ts

@@ -10,12 +10,6 @@ import { QueryCapture } from "web-tree-sitter"
 // Private constant
 const DEFAULT_MIN_COMPONENT_LINES_VALUE = 4
 
-// Language-specific rules
-const LANGUAGE_SKIP_RULES: Record<string, string[]> = {
-	java: ["definition.method"],
-	// Future languages can be added here
-}
-
 // Getter function for MIN_COMPONENT_LINES (for easier testing)
 let currentMinComponentLines = DEFAULT_MIN_COMPONENT_LINES_VALUE
 
@@ -34,8 +28,8 @@ export function setMinComponentLines(value: number): void {
 }
 
 function shouldSkipLineCountCheck(lineCount: number, capture: QueryCapture, language: string) {
-	const skipRules = LANGUAGE_SKIP_RULES[language]
-	if (skipRules && skipRules.includes(capture.name)) {
+	if (["definition.method", "definition.method.start"].includes(capture.name)) {
+		// In object-oriented programming languages, method signatures are only one line and should not be ignored.
 		return false
 	}
 	return lineCount < getMinComponentLines()
@@ -337,14 +331,8 @@ function processCaptures(captures: QueryCapture[], lines: string[], language: st
 			return
 		}
 
-		let outputLineIdx = startLine
-		// For Java method definitions, find the actual method signature line
-		if (language === "java" && name === "definition.method") {
-			outputLineIdx = findJavaMethodSignatureLine(lines, startLine, endLine)
-		}
-
 		// Check if this is a valid component definition (not an HTML element)
-		const startLineContent = lines[outputLineIdx].trim()
+		const startLineContent = lines[startLine].trim()
 
 		// Special handling for component name definitions
 		if (name.includes("name.definition")) {
@@ -353,13 +341,13 @@ function processCaptures(captures: QueryCapture[], lines: string[], language: st
 
 			// Add component name to output regardless of HTML filtering
 			if (!processedLines.has(lineKey) && componentName) {
-				formattedOutput += `${outputLineIdx + 1}--${endLine + 1} | ${lines[outputLineIdx]}\n`
+				formattedOutput += `${startLine + 1}--${endLine + 1} | ${lines[startLine]}\n`
 				processedLines.add(lineKey)
 			}
 		}
 		// For other component definitions
 		else if (isNotHtmlElement(startLineContent)) {
-			formattedOutput += `${outputLineIdx + 1}--${endLine + 1} | ${lines[outputLineIdx]}\n`
+			formattedOutput += `${startLine + 1}--${endLine + 1} | ${lines[startLine]}\n`
 			processedLines.add(lineKey)
 
 			// If this is part of a larger definition, include its non-HTML context
@@ -433,45 +421,3 @@ async function parseFile(
 		return null
 	}
 }
-
-/**
- * Find the line containing the actual Java method signature
- * by looking for lines that match method declaration patterns
- *
- * @param lines - Array of lines from the file
- * @param startLine - Starting line index
- * @param endLine - Ending line index
- * @returns The line index of the method signature
- */
-function findJavaMethodSignatureLine(lines: string[], startLine: number, endLine: number): number {
-	// Java method signature pattern - avoiding backtracking issues
-	// Split into separate checks to avoid complex alternations
-	const accessModifiers = /^\s*(?:public|private|protected)\s+/
-	const otherModifiers = /^\s*(?:static|final|abstract|synchronized|native|strictfp)\s+/
-	const methodPattern = /^\s*(?:\w+(?:\[\])*(?:\s*<[^>]+>)?\s+)+\w+\s*\(/
-
-	for (let i = startLine; i <= endLine; i++) {
-		const line = lines[i].trim()
-
-		// Skip empty lines and annotation lines
-		if (line.length === 0 || line.startsWith("@")) {
-			continue
-		}
-
-		// Check if this looks like a method signature using multiple simple patterns
-		// This avoids complex alternation that can cause backtracking
-		if (accessModifiers.test(line) || otherModifiers.test(line) || methodPattern.test(line)) {
-			return i
-		}
-	}
-
-	// If no method signature found, return the first non-annotation, non-empty line
-	for (let i = startLine; i <= endLine; i++) {
-		const line = lines[i].trim()
-		if (line.length > 0 && !line.startsWith("@")) {
-			return i
-		}
-	}
-
-	return startLine
-}

src/services/tree-sitter/queries/java.ts

@@ -41,6 +41,11 @@ export default `
 (method_declaration
   name: (identifier) @name.definition.method) @definition.method
 
+; Method declarations with type - capture from type start
+(method_declaration
+  type: (_) @definition.method.start
+  name: (identifier) @name.definition.method)
+
 ; Inner class declarations
 (class_declaration
   (class_body