Merge pull request #2299 from opral/improve-m-function-matcher

Improve m function matcher & test coverage

.changeset/empty-windows-clap.md

@@ -0,0 +1,5 @@
+---
+"@inlang/plugin-m-function-matcher": minor
+---
+
+improve matcher to include function referencing & improve test coverage

inlang/source-code/plugins/m-function-matcher/src/ideExtension/messageReferenceMatchers.test.ts

@@ -303,6 +303,49 @@ describe("Paraglide Message Parser", () => {
 		])
 	})
 
+	it("should parse function calls without parentheses", () => {
+		const sourceCode = `import * as m from 'module';
+
+		const a = {
+			b: m.helloWorld,
+			c: m.helloWorld(),
+			d: m.helloWorld().someFunction(),
+			e: m.this_is_a_message123,
+		}
+		`
+		const result = parse(sourceCode)
+		expect(result).toEqual([
+			{
+				messageId: "helloWorld",
+				position: {
+					start: { line: 4, character: 9 },
+					end: { line: 4, character: 19 },
+				},
+			},
+			{
+				messageId: "helloWorld",
+				position: {
+					start: { line: 5, character: 9 },
+					end: { line: 5, character: 21 },
+				},
+			},
+			{
+				messageId: "helloWorld",
+				position: {
+					start: { line: 6, character: 9 },
+					end: { line: 6, character: 21 },
+				},
+			},
+			{
+				messageId: "this_is_a_message123",
+				position: {
+					start: { line: 7, character: 9 },
+					end: { line: 7, character: 29 },
+				},
+			},
+		])
+	})
+
 	it("should match if m is defined before the reference to paraglide", () => {
 		const sourceCode = `
 		m.helloWorld();
@@ -340,4 +383,11 @@ describe("Paraglide Message Parser", () => {
 		const result = parse(sourceCode)
 		expect(result).toEqual([])
 	})
+
+	it("should return an empty array when parsing fails", () => {
+		const sourceCode = undefined
+
+		const result = parse(sourceCode as unknown as string)
+		expect(result).toEqual([])
+	})
 })

inlang/source-code/plugins/m-function-matcher/src/ideExtension/messageReferenceMatchers.ts

@@ -25,10 +25,10 @@ const createParser = () => {
 		findMessage: () => {
 			return Parsimmon.seqMap(
 				Parsimmon.regex(/.*?(?<![a-zA-Z0-9/])m\./s), // no preceding letters or numbers
-				Parsimmon.index, // start position of the message id
-				Parsimmon.regex(/[^(]*/), // message id
-				Parsimmon.index, // end position of the message id
-				Parsimmon.regex(/\((?:[^()]|\([^()]*\))*\)/), // function arguments
+				Parsimmon.index, // Capture start position
+				Parsimmon.regex(/\w+/), // Match the function name
+				Parsimmon.index, // Capture end position of function name
+				Parsimmon.regex(/\((?:[^()]|\([^()]*\))*\)/).or(Parsimmon.succeed("")), // function arguments or empty string
 				(_, start, messageId, end, args) => {
 					return {
 						messageId: `${messageId}`,