fix: hard string detection after extracting, close #542

antfu · antfu · commit 9a250a8668bc · 2021-04-21T01:45:49.000+08:00
diff --git a/locales/de.json b/locales/de.json
@@ -24,6 +24,7 @@
   "command.rename_key": "Schlüssel umbennen",
   "command.set_display_language": "Als Anzeigesprache festlegen",
   "command.set_source_language": "Als Quellsprache festlegen",
+  "command.show_docs": "",
   "command.translate_key": "Übersetzen",
   "command.translate_key_from": "\"{0}\" übersetzen",
   "config.annotation_delimiter": "Trennzeichen",
diff --git a/locales/en.json b/locales/en.json
@@ -20,6 +20,7 @@
   "command.open_key": "Go to definition",
   "command.open_review": "Open review",
   "command.open_url": "Open url",
+  "command.possible_hard_string": "Possible Hard string",
   "command.refresh_usage": "Refresh usage report",
   "command.rename_key": "Rename key",
   "command.set_display_language": "Set as display language",
diff --git a/locales/es.json b/locales/es.json
@@ -24,6 +24,7 @@
   "command.rename_key": "Renombrar clave",
   "command.set_display_language": "Establecer como idioma de visualización",
   "command.set_source_language": "Establecer como idioma de origen",
+  "command.show_docs": "",
   "command.translate_key": "Traducir clave",
   "command.translate_key_from": "Traducir de \"{0}\"",
   "config.annotation_delimiter": "Delimintador de anotaciones",
diff --git a/locales/fr.json b/locales/fr.json
@@ -24,6 +24,7 @@
   "command.rename_key": "Renommer la Clé",
   "command.set_display_language": "Sélectionner en tant que langue affichée",
   "command.set_source_language": "Sélectionner en tant que langage source",
+  "command.show_docs": "",
   "command.translate_key": "Traduire",
   "command.translate_key_from": "Traduire depuis \"{0}\"",
   "config.annotation_delimiter": "Délimiteur d'annotations",
diff --git a/locales/ja.json b/locales/ja.json
@@ -24,6 +24,7 @@
   "command.rename_key": "キーを変更する",
   "command.set_display_language": "表示する言語を設定する",
   "command.set_source_language": "もととなる言語を設定する",
+  "command.show_docs": "",
   "command.translate_key": "翻訳",
   "command.translate_key_from": "\"{0}\"から翻訳する",
   "config.annotation_delimiter": "デリミタアノテーション",
diff --git a/locales/nb-NO.json b/locales/nb-NO.json
@@ -24,6 +24,7 @@
   "command.rename_key": "Gi nøkkel nytt navn",
   "command.set_display_language": "Sett som visningsspråk",
   "command.set_source_language": "Sett som kildespråk",
+  "command.show_docs": "",
   "command.translate_key": "Oversett",
   "command.translate_key_from": "Oversett fra \"{0}\"",
   "config.annotation_delimiter": "",
diff --git a/locales/nl-NL.json b/locales/nl-NL.json
@@ -24,6 +24,7 @@
   "command.rename_key": "Hernoem sleutel",
   "command.set_display_language": "Stel als weergave taal in",
   "command.set_source_language": "Stel als bron taal in",
+  "command.show_docs": "",
   "command.translate_key": "Vertalen",
   "command.translate_key_from": "Vertaal van \"{0}\"",
   "config.annotation_delimiter": "Scheidingsteken van annotaties",
diff --git a/locales/pt-BR.json b/locales/pt-BR.json
@@ -24,6 +24,7 @@
   "command.rename_key": "Renomear chave",
   "command.set_display_language": "Definir como idioma de exibição",
   "command.set_source_language": "Definir como idioma de origem",
+  "command.show_docs": "",
   "command.translate_key": "Traduzir",
   "command.translate_key_from": "Traduzir do \"{0}\"",
   "config.annotation_delimiter": "O delimitador de anotação",
diff --git a/locales/ru.json b/locales/ru.json
@@ -24,6 +24,7 @@
   "command.rename_key": "Переименовать ключ",
   "command.set_display_language": "Установить как отображаемый язык",
   "command.set_source_language": "Установить как исходный язык",
+  "command.show_docs": "",
   "command.translate_key": "Перевести",
   "command.translate_key_from": "Перевести с \"{0}\"",
   "config.annotation_delimiter": "Разделитель аннотаций",
diff --git a/locales/sv-SE.json b/locales/sv-SE.json
@@ -24,6 +24,7 @@
   "command.rename_key": "Ändra namn på nyckel",
   "command.set_display_language": "Sätt som visningsspråk",
   "command.set_source_language": "Sätt som källspråk",
+  "command.show_docs": "",
   "command.translate_key": "Översätt",
   "command.translate_key_from": "Översätt från \"{0}\"",
   "config.annotation_delimiter": "Avskiljare för anteckningar",
diff --git a/locales/uk-UA.json b/locales/uk-UA.json
@@ -24,6 +24,7 @@
   "command.rename_key": "Перейменувати ключ",
   "command.set_display_language": "Встановити як мову відображення",
   "command.set_source_language": "Встановити як вихідну мову",
+  "command.show_docs": "",
   "command.translate_key": "Перекласти",
   "command.translate_key_from": "Перекласти з \"{0}\"",
   "config.annotation_delimiter": "Роздільник анотацій",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
@@ -24,6 +24,7 @@
   "command.rename_key": "重命名路径",
   "command.set_display_language": "设为显示语言",
   "command.set_source_language": "设为源语言",
+  "command.show_docs": "",
   "command.translate_key": "翻译文案",
   "command.translate_key_from": "从 \"{0}\" 翻译",
   "config.annotation_delimiter": "内联注释的分隔符",
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
@@ -24,6 +24,7 @@
   "command.rename_key": "重命名路徑",
   "command.set_display_language": "設定為顯示語言",
   "command.set_source_language": "設定為源語言",
+  "command.show_docs": "",
   "command.translate_key": "翻譯文案",
   "command.translate_key_from": "從 \"{0}\" 翻譯",
   "config.annotation_delimiter": "內聯註釋的分隔符",
diff --git a/src/editor/problems.ts b/src/editor/problems.ts
@@ -32,14 +32,25 @@ export class ProblemProvider {
     const loader: Loader = CurrentFile.loader
 
     const problems: DiagnosticWithDetection[] = []
-    this.collection.delete(document.uri)
+
+    if (CurrentFile.hardStrings?.length) {
+      for (const detection of CurrentFile.hardStrings) {
+        problems.push({
+          code: PROBLEM_CODE_HARD_STRING,
+          message: i18n.t('command.possible_hard_string'),
+          range: new Range(document.positionAt(detection.start), document.positionAt(detection.end)),
+          severity: DiagnosticSeverity.Warning,
+          detection,
+        })
+      }
+    }
 
     const keys = KeyDetector.getKeys(document)
     // get all keys of current file
     for (const { key, start, end } of keys) {
       const has_translation = !!loader.getValueByKey(key, locale)
       if (has_translation)
-        return
+        continue
 
       const exists = !!loader.getNodeByKey(key)
 
@@ -59,18 +70,6 @@ export class ProblemProvider {
       }
     }
 
-    if (CurrentFile.hardStrings?.length) {
-      for (const detection of CurrentFile.hardStrings) {
-        problems.push({
-          code: PROBLEM_CODE_HARD_STRING,
-          message: 'Possible Hard string',
-          range: new Range(document.positionAt(detection.start), document.positionAt(detection.end)),
-          severity: DiagnosticSeverity.Warning,
-          detection,
-        })
-      }
-    }
-
     this.collection.set(document.uri, problems)
   }
 
