fix: detect vscode config

hemengke1997 · Feb 4, 2024 · c7069e8 · c7069e8
1 parent 3367032
commit c7069e8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/TODO.md b/TODO.md
diff --git a/playground/vscode-setting/vite.config.ts b/playground/vscode-setting/vite.config.ts
@@ -8,7 +8,6 @@ export default defineConfig({
     react(),
     i18nDetector({
       root: __dirname,
-      autoDetectI18nConfig: true,
     }),
   ],
 })
diff --git a/src/plugin/utils/I18nAllyVscodeSetting.ts b/src/plugin/utils/I18nAllyVscodeSetting.ts
@@ -11,7 +11,7 @@ export class I18nAllyVscodeSetting {
 
   constructor(
     private readonly _root: string,
-    private readonly _stopAt: string = _root,
+    private readonly _stopAt: string | undefined,
   ) {
     debug('I18nAllyVscodeSetting - root:', _root)
     debug('I18nAllyVscodeSetting - stopAt:', _stopAt)

diff --git a/src/plugin/utils/init-options.ts b/src/plugin/utils/init-options.ts
@@ -33,7 +33,10 @@ function getDefaultOptions(options?: I18nDetectorOptions): I18nDetectorOptions {
 
 export function initOptions(options?: I18nDetectorOptions) {
   return {
-    ...getDefaultOptions(options),
+    ...getDefaultOptions({
+      ...DEFAULT_OPTIONS,
+      ...options,
+    }),
     ...options,
   } as Required<I18nDetectorOptions>
 }