diff options
author | Cashew <52880648+Scrub1492@users.noreply.github.com> | 2024-02-10 12:32:55 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-10 05:32:55 +0000 |
commit | 6c8892e031b8ba9b62e2746f7807b5dafb2b984b (patch) | |
tree | 67754e47b8ebe0815a8fa425fe95d2e6c7c18c66 | |
parent | 884f2a0b9d81ffb41e0df46d2b16c2e102f93435 (diff) |
Add eslint eol-last rule (#662)
* add eol-last eslint rule
* fix lint
* update css-json.test
40 files changed, 42 insertions, 40 deletions
diff --git a/.eslintrc.json b/.eslintrc.json index 440fe53b..5b6ebd05 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -84,6 +84,7 @@ "@stylistic/comma-dangle": ["error", "never"], "@stylistic/comma-spacing": ["error", {"before": false, "after": true}], "@stylistic/computed-property-spacing": ["error", "never"], + "@stylistic/eol-last": ["error", "always"], "@stylistic/func-call-spacing": ["error", "never"], "@stylistic/function-paren-newline": ["error", "multiline-arguments"], "@stylistic/generator-star-spacing": ["error", "before"], diff --git a/dev/generate-css-json.js b/dev/generate-css-json.js index 30728831..b196e411 100644 --- a/dev/generate-css-json.js +++ b/dev/generate-css-json.js @@ -119,6 +119,7 @@ export function formatRulesJson(rules) { } if (ruleIndex > 0) { result += '\n'; } result += ']'; + result += '\n'; return result; } diff --git a/dev/jsconfig.json b/dev/jsconfig.json index db38b6df..d9465108 100644 --- a/dev/jsconfig.json +++ b/dev/jsconfig.json @@ -79,4 +79,4 @@ "../node_modules", "lib" ] -}
\ No newline at end of file +} diff --git a/ext/data/pronunciation-style.json b/ext/data/pronunciation-style.json index d8e54c80..3a69c567 100644 --- a/ext/data/pronunciation-style.json +++ b/ext/data/pronunciation-style.json @@ -163,4 +163,4 @@ ["stroke", "currentColor"] ] } -]
\ No newline at end of file +] diff --git a/ext/data/schemas/dictionary-index-schema.json b/ext/data/schemas/dictionary-index-schema.json index 98b27143..56726668 100644 --- a/ext/data/schemas/dictionary-index-schema.json +++ b/ext/data/schemas/dictionary-index-schema.json @@ -87,4 +87,4 @@ "required": ["version"] } ] -}
\ No newline at end of file +} diff --git a/ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json b/ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json index 1cd80565..bdbddf9b 100644 --- a/ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json +++ b/ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json @@ -49,4 +49,4 @@ } ] } -}
\ No newline at end of file +} diff --git a/ext/data/schemas/dictionary-tag-bank-v3-schema.json b/ext/data/schemas/dictionary-tag-bank-v3-schema.json index af8844e8..f3a2f89b 100644 --- a/ext/data/schemas/dictionary-tag-bank-v3-schema.json +++ b/ext/data/schemas/dictionary-tag-bank-v3-schema.json @@ -32,4 +32,4 @@ } ] } -}
\ No newline at end of file +} diff --git a/ext/data/schemas/dictionary-term-bank-v3-schema.json b/ext/data/schemas/dictionary-term-bank-v3-schema.json index 77df3071..40a326f6 100644 --- a/ext/data/schemas/dictionary-term-bank-v3-schema.json +++ b/ext/data/schemas/dictionary-term-bank-v3-schema.json @@ -586,4 +586,4 @@ } ] } -}
\ No newline at end of file +} diff --git a/ext/data/schemas/dictionary-term-meta-bank-v3-schema.json b/ext/data/schemas/dictionary-term-meta-bank-v3-schema.json index 89709a9e..2dfbdb74 100644 --- a/ext/data/schemas/dictionary-term-meta-bank-v3-schema.json +++ b/ext/data/schemas/dictionary-term-meta-bank-v3-schema.json @@ -215,4 +215,4 @@ } ] } -}
\ No newline at end of file +} diff --git a/ext/data/structured-content-style.json b/ext/data/structured-content-style.json index 52bd41c8..a1110dce 100644 --- a/ext/data/structured-content-style.json +++ b/ext/data/structured-content-style.json @@ -335,4 +335,4 @@ ["border-color", "currentColor"] ] } -]
\ No newline at end of file +] diff --git a/ext/js/accessibility/google-docs-xray.js b/ext/js/accessibility/google-docs-xray.js index f128c058..15e1d50b 100644 --- a/ext/js/accessibility/google-docs-xray.js +++ b/ext/js/accessibility/google-docs-xray.js @@ -27,4 +27,4 @@ function main() { window2._docs_annotate_canvas_by_ext = 'ogmnaimimemjmbakcfefmnahgdfhfami'; } -main();
\ No newline at end of file +main(); diff --git a/ext/js/core/fetch-utilities.js b/ext/js/core/fetch-utilities.js index 074f7c9a..ccd8a305 100644 --- a/ext/js/core/fetch-utilities.js +++ b/ext/js/core/fetch-utilities.js @@ -54,4 +54,4 @@ export async function fetchText(url) { export async function fetchJson(url) { const response = await fetchAsset(url); return await readResponseJson(response); -}
\ No newline at end of file +} diff --git a/test/data/anki-note-builder-test-results.json b/test/data/anki-note-builder-test-results.json index 7dda6200..a2dd0923 100644 --- a/test/data/anki-note-builder-test-results.json +++ b/test/data/anki-note-builder-test-results.json @@ -3799,4 +3799,4 @@ } ] } -]
\ No newline at end of file +] diff --git a/test/data/dictionaries/invalid-dictionary1/index.json b/test/data/dictionaries/invalid-dictionary1/index.json index 1be3b360..f4c7cf27 100644 --- a/test/data/dictionaries/invalid-dictionary1/index.json +++ b/test/data/dictionaries/invalid-dictionary1/index.json @@ -4,4 +4,4 @@ "revision": "test", "sequenced": true, "description": "Invalid format number" -}
\ No newline at end of file +} diff --git a/test/data/dictionaries/invalid-dictionary2/index.json b/test/data/dictionaries/invalid-dictionary2/index.json index ba2cc669..ef7f8703 100644 --- a/test/data/dictionaries/invalid-dictionary2/index.json +++ b/test/data/dictionaries/invalid-dictionary2/index.json @@ -4,4 +4,4 @@ "revision": "test", "sequenced": true, "description": "Empty entry in kanji bank" -}
\ No newline at end of file +} diff --git a/test/data/dictionaries/invalid-dictionary2/kanji_bank_1.json b/test/data/dictionaries/invalid-dictionary2/kanji_bank_1.json index 5825bcac..eab343f5 100644 --- a/test/data/dictionaries/invalid-dictionary2/kanji_bank_1.json +++ b/test/data/dictionaries/invalid-dictionary2/kanji_bank_1.json @@ -1,3 +1,3 @@ [ [] -]
\ No newline at end of file +] diff --git a/test/data/dictionaries/invalid-dictionary3/index.json b/test/data/dictionaries/invalid-dictionary3/index.json index f23fa3f0..770d043e 100644 --- a/test/data/dictionaries/invalid-dictionary3/index.json +++ b/test/data/dictionaries/invalid-dictionary3/index.json @@ -4,4 +4,4 @@ "revision": "test", "sequenced": true, "description": "Invalid type entry in kanji meta bank" -}
\ No newline at end of file +} diff --git a/test/data/dictionaries/invalid-dictionary3/kanji_meta_bank_1.json b/test/data/dictionaries/invalid-dictionary3/kanji_meta_bank_1.json index 9e26dfee..0967ef42 100644 --- a/test/data/dictionaries/invalid-dictionary3/kanji_meta_bank_1.json +++ b/test/data/dictionaries/invalid-dictionary3/kanji_meta_bank_1.json @@ -1 +1 @@ -{}
\ No newline at end of file +{} diff --git a/test/data/dictionaries/invalid-dictionary4/index.json b/test/data/dictionaries/invalid-dictionary4/index.json index 542791d7..ed64a04f 100644 --- a/test/data/dictionaries/invalid-dictionary4/index.json +++ b/test/data/dictionaries/invalid-dictionary4/index.json @@ -4,4 +4,4 @@ "revision": "test", "sequenced": true, "description": "Invalid value as part of a tag bank entry" -}
\ No newline at end of file +} diff --git a/test/data/dictionaries/invalid-dictionary4/tag_bank_1.json b/test/data/dictionaries/invalid-dictionary4/tag_bank_1.json index 4f19b476..1b4ed7e7 100644 --- a/test/data/dictionaries/invalid-dictionary4/tag_bank_1.json +++ b/test/data/dictionaries/invalid-dictionary4/tag_bank_1.json @@ -1,3 +1,3 @@ [ [{"invalid": true}, "category1", 0, "tag1 notes", 0] -]
\ No newline at end of file +] diff --git a/test/data/dictionaries/invalid-dictionary5/index.json b/test/data/dictionaries/invalid-dictionary5/index.json index e0d0f00e..fa128a89 100644 --- a/test/data/dictionaries/invalid-dictionary5/index.json +++ b/test/data/dictionaries/invalid-dictionary5/index.json @@ -4,4 +4,4 @@ "revision": "test", "sequenced": true, "description": "Invalid type as part of a term bank entry" -}
\ No newline at end of file +} diff --git a/test/data/dictionaries/invalid-dictionary5/term_bank_1.json b/test/data/dictionaries/invalid-dictionary5/term_bank_1.json index 7288a996..79b86a1e 100644 --- a/test/data/dictionaries/invalid-dictionary5/term_bank_1.json +++ b/test/data/dictionaries/invalid-dictionary5/term_bank_1.json @@ -1,3 +1,3 @@ [ ["打", "だ", "tag1 tag2", "", 2, false, 1, "tag3 tag4 tag5"] -]
\ No newline at end of file +] diff --git a/test/data/dictionaries/invalid-dictionary6/index.json b/test/data/dictionaries/invalid-dictionary6/index.json index b91acca3..595e3fe4 100644 --- a/test/data/dictionaries/invalid-dictionary6/index.json +++ b/test/data/dictionaries/invalid-dictionary6/index.json @@ -4,4 +4,4 @@ "revision": "test", "sequenced": true, "description": "Invalid root type for term meta bank" -}
\ No newline at end of file +} diff --git a/test/data/dictionaries/invalid-dictionary6/term_meta_bank_1.json b/test/data/dictionaries/invalid-dictionary6/term_meta_bank_1.json index 02e4a84d..c508d536 100644 --- a/test/data/dictionaries/invalid-dictionary6/term_meta_bank_1.json +++ b/test/data/dictionaries/invalid-dictionary6/term_meta_bank_1.json @@ -1 +1 @@ -false
\ No newline at end of file +false diff --git a/test/data/dictionaries/valid-dictionary1/index.json b/test/data/dictionaries/valid-dictionary1/index.json index 3034bf38..a926fa92 100644 --- a/test/data/dictionaries/valid-dictionary1/index.json +++ b/test/data/dictionaries/valid-dictionary1/index.json @@ -3,4 +3,4 @@ "format": 3, "revision": "test", "sequenced": true -}
\ No newline at end of file +} diff --git a/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json b/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json index e1e81fc4..313eab3d 100644 --- a/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json +++ b/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json @@ -39,4 +39,4 @@ "kstat5": "kanji stat 5 value" } ] -]
\ No newline at end of file +] diff --git a/test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json b/test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json index 56b91713..c4dae207 100644 --- a/test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json +++ b/test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json @@ -5,4 +5,4 @@ ["込", "freq", "four (4)"], ["打", "freq", {"value": 5}], ["込", "freq", {"value": 6, "displayValue": "six"}] -]
\ No newline at end of file +] diff --git a/test/data/dictionaries/valid-dictionary1/tag_bank_1.json b/test/data/dictionaries/valid-dictionary1/tag_bank_1.json index 3cdc322e..718dfe20 100644 --- a/test/data/dictionaries/valid-dictionary1/tag_bank_1.json +++ b/test/data/dictionaries/valid-dictionary1/tag_bank_1.json @@ -5,4 +5,4 @@ ["n", "partOfSpeech", 0, "noun", 0], ["vt", "partOfSpeech", 0, "transitive verb", 0], ["abbr", "default", 0, "abbreviation", 0] -]
\ No newline at end of file +] diff --git a/test/data/dictionaries/valid-dictionary1/tag_bank_2.json b/test/data/dictionaries/valid-dictionary1/tag_bank_2.json index 34a9905d..06049eb8 100644 --- a/test/data/dictionaries/valid-dictionary1/tag_bank_2.json +++ b/test/data/dictionaries/valid-dictionary1/tag_bank_2.json @@ -6,4 +6,4 @@ ["kstat3", "index", 0, "kanji stat 3", 0], ["kstat4", "misc", 0, "kanji stat 4", 0], ["kstat5", "misc", 0, "kanji stat 5", 0] -]
\ No newline at end of file +] diff --git a/test/data/dictionaries/valid-dictionary1/tag_bank_3.json b/test/data/dictionaries/valid-dictionary1/tag_bank_3.json index b5970584..04d86777 100644 --- a/test/data/dictionaries/valid-dictionary1/tag_bank_3.json +++ b/test/data/dictionaries/valid-dictionary1/tag_bank_3.json @@ -1,4 +1,4 @@ [ ["P1", "default", 0, "example pitch tag 1", 0], ["P2", "default", 0, "example pitch tag 2", 0] -]
\ No newline at end of file +] diff --git a/test/data/dictionaries/valid-dictionary1/term_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_bank_1.json index ae32d146..03a9900c 100644 --- a/test/data/dictionaries/valid-dictionary1/term_bank_1.json +++ b/test/data/dictionaries/valid-dictionary1/term_bank_1.json @@ -342,4 +342,4 @@ ["のたもうた", "のたもうた", "", "", 1, [["のたまう", ["past"]]], 16, ""], ["39", "さんきゅう", "", "", 1, ["sankyuu definition"], 17, ""], ["凄い", "すごい", "adj-i", "adj-i", 1, ["sugoi definition"], 18, ""] -]
\ No newline at end of file +] diff --git a/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json index 56296648..eb763d39 100644 --- a/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json +++ b/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json @@ -119,4 +119,4 @@ ] } ] -]
\ No newline at end of file +] diff --git a/test/data/translator-test-inputs.json b/test/data/translator-test-inputs.json index 2b8bebb3..03ec938a 100644 --- a/test/data/translator-test-inputs.json +++ b/test/data/translator-test-inputs.json @@ -442,4 +442,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/test/data/translator-test-results-note-data1.json b/test/data/translator-test-results-note-data1.json index 1c210862..f84f28a4 100644 --- a/test/data/translator-test-results-note-data1.json +++ b/test/data/translator-test-results-note-data1.json @@ -32392,4 +32392,4 @@ } ] } -]
\ No newline at end of file +] diff --git a/test/data/translator-test-results.json b/test/data/translator-test-results.json index 925d36cf..e11cb4a9 100644 --- a/test/data/translator-test-results.json +++ b/test/data/translator-test-results.json @@ -18268,4 +18268,4 @@ } ] } -]
\ No newline at end of file +] diff --git a/test/data/vitest.write.config.json b/test/data/vitest.write.config.json index ecb4bd84..7de11ae9 100644 --- a/test/data/vitest.write.config.json +++ b/test/data/vitest.write.config.json @@ -4,4 +4,4 @@ "../**/*.write.js" ] } -}
\ No newline at end of file +} diff --git a/test/jsconfig.json b/test/jsconfig.json index bc8b8a90..4f7f175b 100644 --- a/test/jsconfig.json +++ b/test/jsconfig.json @@ -41,4 +41,4 @@ "../node_modules", "../dev/lib" ] -}
\ No newline at end of file +} diff --git a/test/language-transformer-cycles.test.js b/test/language-transformer-cycles.test.js index 76bee83e..b778c188 100644 --- a/test/language-transformer-cycles.test.js +++ b/test/language-transformer-cycles.test.js @@ -154,8 +154,8 @@ describe('Deinflection data', () => { for (const item of newDeinflectionNode.getHistory()) { stack.push( item.ruleNode === null ? - `${item.text} (start)` : - `${item.text} (${item.ruleNode.groupName}, ${item.ruleNode.rule.conditionsIn.join(',')}=>${item.ruleNode.rule.conditionsOut.join(',')}, ${item.ruleNode.rule.suffixIn}=>${item.ruleNode.rule.suffixOut})` + `${item.text} (start)` : + `${item.text} (${item.ruleNode.groupName}, ${item.ruleNode.rule.conditionsIn.join(',')}=>${item.ruleNode.rule.conditionsOut.join(',')}, ${item.ruleNode.rule.suffixIn}=>${item.ruleNode.rule.suffixOut})` ); } const message = `Cycle detected:\n ${stack.join('\n ')}`; @@ -167,4 +167,4 @@ describe('Deinflection data', () => { } } }); -});
\ No newline at end of file +}); diff --git a/types/ext/display-content-manager.d.ts b/types/ext/display-content-manager.d.ts index c0cb183f..a216fce9 100644 --- a/types/ext/display-content-manager.d.ts +++ b/types/ext/display-content-manager.d.ts @@ -37,4 +37,4 @@ export type CachedMediaDataLoaded = { export type LoadMediaDataInfo = { onUnload: OnUnloadCallback; loaded: boolean; -};
\ No newline at end of file +}; diff --git a/types/ext/display.d.ts b/types/ext/display.d.ts index 351cf067..a2e61209 100644 --- a/types/ext/display.d.ts +++ b/types/ext/display.d.ts @@ -274,4 +274,4 @@ type WindowApiMessage<TName extends WindowApiNames> = { params: WindowApiParams<TName>; }; -export type WindowApiFrameClientMessageAny = {[name in WindowApiNames]: FrameClientMessage<WindowApiMessage<name>>}[WindowApiNames];
\ No newline at end of file +export type WindowApiFrameClientMessageAny = {[name in WindowApiNames]: FrameClientMessage<WindowApiMessage<name>>}[WindowApiNames]; |