Merge pull request #1307 from nshcr/fix-typo

fix typo: `twp-space-line-break` to `two-space-line-break`

Author: pjkaufman

__integration__/obsidian-mode.test.ts

@@ -65,7 +65,7 @@ function edgeCaseSetup(plugin: TestLinterPlugin, _: Editor): Promise<void> {
   };
   plugin.plugin.settings.ruleConfigs['trailing-spaces'] = {
     'enabled': true,
-    'twp-space-line-break': false,
+    'two-space-line-break': false,
   };
   plugin.plugin.settings.ruleConfigs['convert-bullet-list-markers'] = {
     'enabled': true,

src/lang/locale/de.ts

@@ -642,7 +642,7 @@ export default {
     'trailing-spaces': {
       'name': 'Nachgestellte Leerzeichen',
       'description': 'Entfernt zusätzliche Leerzeichen nach jeder Zeile.',
-      'twp-space-line-break': {
+      'two-space-line-break': {
         'name': 'Zwei Leerzeichen Zeilenumbruch',
         'description': 'Ignorieren Sie zwei Leerzeichen, gefolgt von einem Zeilenumbruch ("Zwei-Leerzeichen-Regel").',
       },

src/lang/locale/en.ts

@@ -787,7 +787,7 @@ export default {
     'trailing-spaces': {
       'name': 'Trailing spaces',
       'description': 'Removes extra spaces after every line.',
-      'twp-space-line-break': {
+      'two-space-line-break': {
         'name': 'Two Space Linebreak',
         'description': 'Ignore two spaces followed by a line break ("Two Space Rule").',
       },

src/lang/locale/es.ts

@@ -558,7 +558,7 @@ export default {
     'trailing-spaces': {
       'name': 'Espacios finales',
       'description': 'Elimina espacios adicionales después de cada línea.',
-      'twp-space-line-break': {
+      'two-space-line-break': {
         'name': 'Salto de línea de dos espacios',
         'description': 'Ignore dos espacios seguidos de un salto de línea ("Regla de dos espacios").',
       },

src/lang/locale/ru.ts

@@ -775,7 +775,7 @@ export default {
     'trailing-spaces': {
       'name': 'Пробелы в конце строки',
       'description': 'Удаляет дополнительные пробелы после каждой строки.',
-      'twp-space-line-break': {
+      'two-space-line-break': {
         'name': 'Две пробела в конце строки',
         'description': 'Игнорирует две пробела, за которыми следует разрыв строки ("Две пробела в конце строки").',
       },

src/lang/locale/tr.ts

@@ -638,7 +638,7 @@ export default {
     'trailing-spaces': {
       'name': 'Sondaki boşluklar',
       'description': 'Her satırın sonundaki fazladan boşlukları kaldırır.',
-      'twp-space-line-break': {
+      'two-space-line-break': {
         'name': 'İki Boşluklu Satır Sonu',
         'description': 'Bir satır sonunu takiben iki boşluğu göz ardı et ("İki Boşluk Kuralı").',
       },

src/lang/locale/zh-cn.ts

@@ -775,7 +775,7 @@ export default {
     'trailing-spaces': {
       'name': '末尾空格',
       'description': '移除每行末尾多余的空格',
-      'twp-space-line-break': {
+      'two-space-line-break': {
         'name': '两空格换行',
         'description': '忽略两个空格后接换行符的情况（"两空格规则"）',
       },

src/main.ts

@@ -641,6 +641,14 @@ export default class LinterPlugin extends Plugin {
       updateMade = true;
     }
 
+    // move the setting of typo rule name to its new name
+    if (this.settings.ruleConfigs['trailing-spaces'] && 'twp-space-line-break' in this.settings.ruleConfigs['trailing-spaces']) {
+      this.settings.ruleConfigs['trailing-spaces']['two-space-line-break'] = this.settings.ruleConfigs['trailing-spaces']['twp-space-line-break'];
+
+      delete this.settings.ruleConfigs['trailing-spaces']['twp-space-line-break'];
+      updateMade = true;
+    }
+
     // check for and fix invalid settings
     let noticeText = 'Obsidian Linter:';
     let conflictingRulePresent = false;

src/rules/trailing-spaces.ts

@@ -80,8 +80,8 @@ export default class TrailingSpaces extends RuleBuilder<TrailingSpacesOptions> {
     return [
       new BooleanOptionBuilder({
         OptionsClass: TrailingSpacesOptions,
-        nameKey: 'rules.trailing-spaces.twp-space-line-break.name',
-        descriptionKey: 'rules.trailing-spaces.twp-space-line-break.description',
+        nameKey: 'rules.trailing-spaces.two-space-line-break.name',
+        descriptionKey: 'rules.trailing-spaces.two-space-line-break.description',
         optionsKey: 'twoSpaceLineBreak',
       }),
     ];

test-vault/.obsidian/plugins/obsidian-linter/data.json

@@ -216,7 +216,7 @@
     },
     "trailing-spaces": {
       "enabled": false,
-      "twp-space-line-break": false
+      "two-space-line-break": false
     },
     "add-blockquote-indentation-on-paste": {
       "enabled": false