fix: fix validator string Regx (#3)

Author: Styx11

client/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "client",
 	"displayName": "React-Intl-Linter - Client",
-	"version": "0.0.2",
+	"version": "0.0.3",
 	"description": "vscode linter extension for react-intl",
 	"repository": "git@github.com:Styx11/react-intl-linter.git",
 	"author": "styx11 <1654630248@qq.com>",

client/src/lib/util.ts

@@ -37,7 +37,7 @@ const getIntlIdCount = (number: number): string =>
  */
 export const getCleanIntlId = (translationResult: string): string =>
 {
-	return translationResult.replace(INVALID_INTL_ID_CHARACTER, '')
+	return translationResult.replace(INVALID_INTL_ID_CHARACTER, '').trim()
 }
 
 /**

client/tsconfig.json

@@ -14,6 +14,8 @@
 		"src"
 	],
 	"exclude": [
-		"node_modules"
+		"node_modules",
+		"package-lock.json",
+		"package.json"
 	]
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "react-intl-linter",
-	"version": "0.0.2",
+	"version": "0.0.3",
 	"publisher": "styx11",
 	"description": "vscode linter extension for react-intl",
 	"repository": "git@github.com:Styx11/react-intl-linter.git",

react-intl-linter-0.0.2.vsix

@@ -1,6 +1,6 @@
 {
 	"name": "server",
-	"version": "0.0.2",
+	"version": "0.0.3",
 	"description": "vscode linter extension for react-intl",
 	"repository": "git@github.com:Styx11/react-intl-linter.git",
 	"author": "styx11 <1654630248@qq.com>",

server/package.json

@@ -1,6 +1,8 @@
 
 // 匹配单引号/双引号内的字符串文本
-export const StringReg = /'(.+)'|"(.+)"/gu
+// 单个字符 . 的匹配默认是贪婪的，所以当有多个带引号的句子在一行时，匹配结果就会是从第一个引号开始到最后一个引号结束，所以要用 [^'\n]+ 和 [^"\n]+ 去匹配
+// 例如 const message = `${'添加'}hellllllo${'添加'}` 会匹配为 添加'}hellllllo${'添加
+export const StringReg = /'([^'\n]+)'|"([^"\n]+)"/gu
 
 // 错误信息
 export const DiagnosticMessage = ' is a Chinese sentence'

server/src/lib/util.ts

@@ -8,4 +8,8 @@
 
 '添加'
 
+const message = `${"添加"}hellllllo${"添加"}`
+
+const testMsg = `${'添加'}hellllllo${'一个文本'}hellllllo{"这是另一个文本"}`
+
 "English!!!"

test_files/TypescriptReact.tsx

@@ -13,7 +13,9 @@
 		"src"
 	],
 	"exclude": [
-		"node_modules"
+		"node_modules",
+		"package-lock.json",
+		"package.json"
 	],
 	"references": [
 		{ "path": "./client" },