From 25c53cb0ac5a7c2782c606bc1e5c2f761adc5b01 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Wed, 25 Jun 2025 14:21:44 +0200 Subject: [PATCH] Enable eslint style rule 'keyword-spacing' After Stan suggesting change in a review comment just enable the rule 'keyword-spacing' [1] and fix violations so this is no longer a topic in spirit of #7812. [1] https://eslint.style/rules/keyword-spacing Ref: #7245 Ref: #7812 Signed-off-by: Ralph Sennhauser --- .../mods/_test.sim/simulation/components/test-param.js | 10 +++++----- .../mods/public/gui/campaigns/load_modal/LoadModal.js | 2 +- .../gamesetup/Controllers/GameSettingsController.js | 2 +- binaries/data/mods/public/gui/locale/locale.js | 4 ++-- binaries/data/mods/public/gui/pregame/MainMenuItems.js | 4 ++-- .../mods/public/gui/reference/civinfo/CivInfoPage.js | 2 +- .../data/mods/public/gui/replaymenu/replay_filters.js | 4 ++-- binaries/data/mods/public/maps/random/rmgen/Noise.js | 4 ++-- .../simulation/ai/common-api/terrain-analysis.js | 2 +- .../data/mods/public/simulation/ai/petra/_petrabot.js | 2 +- .../mods/public/simulation/ai/petra/baseManager.js | 2 +- .../mods/public/simulation/ai/petra/defenseManager.js | 2 +- .../mods/public/simulation/components/AIInterface.js | 2 +- .../simulation/components/PopulationCapManager.js | 4 ++-- .../simulation/components/tests/test_TurretHolder.js | 6 +++--- binaries/data/mods/public/simulation/helpers/Cheat.js | 2 +- .../data/mods/public/simulation/helpers/Commands.js | 4 ++-- .../data/mods/public/simulation/helpers/InitGame.js | 2 +- eslint.config.mjs | 1 + source/tools/profiler2/Profiler2Report.js | 2 +- 20 files changed, 32 insertions(+), 31 deletions(-) diff --git a/binaries/data/mods/_test.sim/simulation/components/test-param.js b/binaries/data/mods/_test.sim/simulation/components/test-param.js index ecbbe1de92..3756c273e0 100644 --- a/binaries/data/mods/_test.sim/simulation/components/test-param.js +++ b/binaries/data/mods/_test.sim/simulation/components/test-param.js @@ -20,11 +20,11 @@ Engine.RegisterComponentType(IID_Test1, "TestScript1_Init", TestScript1_Init); function TestScript1_readonly() {} TestScript1_readonly.prototype.GetX = function() { - try { this.template = null; } catch(e) { /* noop */ } - try { delete this.template; } catch(e) { /* noop */ } - try { this.template.x += 1000; } catch(e) { /* noop */ } - try { delete this.template.x; } catch(e) { /* noop */ } - try { this.template.y = 2000; } catch(e) { /* noop */ } + try { this.template = null; } catch (e) { /* noop */ } + try { delete this.template; } catch (e) { /* noop */ } + try { this.template.x += 1000; } catch (e) { /* noop */ } + try { delete this.template.x; } catch (e) { /* noop */ } + try { this.template.y = 2000; } catch (e) { /* noop */ } return +(this.template.x || 1) + +(this.template.y || 2); }; diff --git a/binaries/data/mods/public/gui/campaigns/load_modal/LoadModal.js b/binaries/data/mods/public/gui/campaigns/load_modal/LoadModal.js index 1f81c95caa..68fede49a3 100644 --- a/binaries/data/mods/public/gui/campaigns/load_modal/LoadModal.js +++ b/binaries/data/mods/public/gui/campaigns/load_modal/LoadModal.js @@ -71,7 +71,7 @@ class LoadModal extends AutoWatcher { out.push(new CampaignRun(name).load()); } - catch(err) + catch (err) { warn(err.toString()); out.push(new BrokenRun(name)); diff --git a/binaries/data/mods/public/gui/gamesetup/Controllers/GameSettingsController.js b/binaries/data/mods/public/gui/gamesetup/Controllers/GameSettingsController.js index b6a73faeb1..a163686057 100644 --- a/binaries/data/mods/public/gui/gamesetup/Controllers/GameSettingsController.js +++ b/binaries/data/mods/public/gui/gamesetup/Controllers/GameSettingsController.js @@ -95,7 +95,7 @@ class GameSettingsController if (settings) this.parseSettings(settings, true); } - } catch(err) { + } catch (err) { error("There was an error loading game settings. You may need to disable persistent match settings."); warn(err?.toString() ?? uneval(err)); if (err.stack) diff --git a/binaries/data/mods/public/gui/locale/locale.js b/binaries/data/mods/public/gui/locale/locale.js index f482796b3c..976b9658ad 100644 --- a/binaries/data/mods/public/gui/locale/locale.js +++ b/binaries/data/mods/public/gui/locale/locale.js @@ -22,7 +22,7 @@ function init() function applySelectedLocale() { var localeText = Engine.GetGUIObjectByName("localeText"); - if(!Engine.SaveLocale(localeText.caption)) + if (!Engine.SaveLocale(localeText.caption)) { warn("Selected locale could not be saved in the configuration!"); return; @@ -37,7 +37,7 @@ function languageSelectionChanged() var locale = languageList.list_data[languageList.selected]; if (locale == "long") warn("'long' is not an actual language, just a collection of all longest strings extracted from some languages"); - else if(!Engine.ValidateLocale(locale)) + else if (!Engine.ValidateLocale(locale)) warn("Selected locale is not valid! This is not expected, please report the issue."); var localeText = Engine.GetGUIObjectByName("localeText"); localeText.caption = locale; diff --git a/binaries/data/mods/public/gui/pregame/MainMenuItems.js b/binaries/data/mods/public/gui/pregame/MainMenuItems.js index dda32d0573..febf1be12a 100644 --- a/binaries/data/mods/public/gui/pregame/MainMenuItems.js +++ b/binaries/data/mods/public/gui/pregame/MainMenuItems.js @@ -79,7 +79,7 @@ var g_MainMenuItems = [ { Engine.SwitchGuiPage(CampaignRun.getCurrentRun().getMenuPath()); } - catch(err) + catch (err) { error("Error opening campaign run:"); error(err.toString()); @@ -136,7 +136,7 @@ var g_MainMenuItems = [ { Engine.SwitchGuiPage(CampaignRun.getCurrentRun().getMenuPath()); } - catch(err) + catch (err) { error("Error opening campaign run:"); error(err.toString()); diff --git a/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js b/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js index ba7f37b584..58e4f2f20a 100644 --- a/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js +++ b/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js @@ -58,7 +58,7 @@ class CivInfoPage extends ReferencePage const civInfo = this.civData[civCode]; - if(!civInfo) + if (!civInfo) error(sprintf("Error loading civ data for \"%(code)s\"", { "code": civCode })); this.gameplaySection.update(this.activeCiv, civInfo); diff --git a/binaries/data/mods/public/gui/replaymenu/replay_filters.js b/binaries/data/mods/public/gui/replaymenu/replay_filters.js index 7505df280f..4019adf7e3 100644 --- a/binaries/data/mods/public/gui/replaymenu/replay_filters.js +++ b/binaries/data/mods/public/gui/replaymenu/replay_filters.js @@ -240,10 +240,10 @@ function filterReplays() else if (cmpA > cmpB) return +sortOrder; - else if(cmpA_secondary && cmpB_secondary) + else if (cmpA_secondary && cmpB_secondary) if (cmpA_secondary < cmpB_secondary) return -sortOrder; - else if(cmpA_secondary > cmpB_secondary) + else if (cmpA_secondary > cmpB_secondary) return +sortOrder; return 0; diff --git a/binaries/data/mods/public/maps/random/rmgen/Noise.js b/binaries/data/mods/public/maps/random/rmgen/Noise.js index 89145acece..7309d8486e 100644 --- a/binaries/data/mods/public/maps/random/rmgen/Noise.js +++ b/binaries/data/mods/public/maps/random/rmgen/Noise.js @@ -86,14 +86,14 @@ function Noise3D(freq, vfreq) for (let j=0; j < freq; ++j) { this.grads[i][j] = []; - for(let k=0; k < vfreq; ++k) + for (let k=0; k < vfreq; ++k) { const v = new Vector3D(); do { v.set(randFloat(-1, 1), randFloat(-1, 1), randFloat(-1, 1)); } - while(v.lengthSquared() > 1 || v.lengthSquared() < 0.1); + while (v.lengthSquared() > 1 || v.lengthSquared() < 0.1); v.normalize(); diff --git a/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis.js b/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis.js index 5f0aabc63c..a1e9aecfee 100644 --- a/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis.js +++ b/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis.js @@ -297,7 +297,7 @@ m.Accessibility.prototype.floodFill = function(startIndex, value, onWater) // Get x and y from index const IndexArray = [startIndex]; let newIndex; - while(IndexArray.length) + while (IndexArray.length) { newIndex = IndexArray.pop(); diff --git a/binaries/data/mods/public/simulation/ai/petra/_petrabot.js b/binaries/data/mods/public/simulation/ai/petra/_petrabot.js index 22ad04b30b..dd15aa160b 100644 --- a/binaries/data/mods/public/simulation/ai/petra/_petrabot.js +++ b/binaries/data/mods/public/simulation/ai/petra/_petrabot.js @@ -95,7 +95,7 @@ PETRA.PetraBot.prototype.OnUpdate = function(sharedScript) { if (i == "AIMetadata") // not used inside petra continue; - if(this.savedEvents[i] !== undefined) + if (this.savedEvents[i] !== undefined) this.savedEvents[i] = this.savedEvents[i].concat(this.events[i]); else this.savedEvents[i] = this.events[i]; diff --git a/binaries/data/mods/public/simulation/ai/petra/baseManager.js b/binaries/data/mods/public/simulation/ai/petra/baseManager.js index dc13c55bcb..1acb382d57 100644 --- a/binaries/data/mods/public/simulation/ai/petra/baseManager.js +++ b/binaries/data/mods/public/simulation/ai/petra/baseManager.js @@ -1081,7 +1081,7 @@ PETRA.BaseManager.prototype.update = function(gameState, queues, events) if (this.constructing) { const owner = gameState.ai.HQ.territoryMap.getOwner(this.anchor.position()); - if(owner != 0 && !gameState.isPlayerAlly(owner)) + if (owner != 0 && !gameState.isPlayerAlly(owner)) { // we're in enemy territory. If we're too close from the enemy, destroy us. const ccEnts = gameState.updatingGlobalCollection("allCCs", API3.Filters.byClass("CivCentre")); diff --git a/binaries/data/mods/public/simulation/ai/petra/defenseManager.js b/binaries/data/mods/public/simulation/ai/petra/defenseManager.js index 47294d3d51..45eed7f2b2 100644 --- a/binaries/data/mods/public/simulation/ai/petra/defenseManager.js +++ b/binaries/data/mods/public/simulation/ai/petra/defenseManager.js @@ -354,7 +354,7 @@ PETRA.DefenseManager.prototype.checkEnemyArmies = function(gameState) continue; if (API3.SquareVectorDistance(base.position(), army.foePosition) > 40000) continue; - if(this.Config.debug > 1) + if (this.Config.debug > 1) API3.warn("army in neutral territory, but still near one of our CC"); stillDangerous = true; break; diff --git a/binaries/data/mods/public/simulation/components/AIInterface.js b/binaries/data/mods/public/simulation/components/AIInterface.js index cb4e7b7542..41ce2c783f 100644 --- a/binaries/data/mods/public/simulation/components/AIInterface.js +++ b/binaries/data/mods/public/simulation/components/AIInterface.js @@ -260,7 +260,7 @@ AIInterface.prototype.OnTemplateModification = function(msg) newValue = Math.round(newValue); // TODO in some cases, we can have two opposite changes which bring us to the old value, // and we should keep it. But how to distinguish it ? - if(newValue == oldValue) + if (newValue == oldValue) continue; if (!this.changedTemplateInfo[msg.player]) this.changedTemplateInfo[msg.player] = {}; diff --git a/binaries/data/mods/public/simulation/components/PopulationCapManager.js b/binaries/data/mods/public/simulation/components/PopulationCapManager.js index ae8d64ff2b..aa6bebc917 100644 --- a/binaries/data/mods/public/simulation/components/PopulationCapManager.js +++ b/binaries/data/mods/public/simulation/components/PopulationCapManager.js @@ -62,7 +62,7 @@ PopulationCapManager.prototype.GetPopulationCap = function() */ PopulationCapManager.prototype.InitializePopCaps = function() { - switch(this.popCapType) + switch (this.popCapType) { case CAPTYPE_PLAYER_POPULATION: this.InitializePlayerPopCaps(); @@ -149,7 +149,7 @@ PopulationCapManager.prototype.RedistributeWorldPopCap = function() */ PopulationCapManager.prototype.OnGlobalPlayerDefeated = function(msg) { - switch(this.popCapType) + switch (this.popCapType) { case CAPTYPE_TEAM_POPULATION: { diff --git a/binaries/data/mods/public/simulation/components/tests/test_TurretHolder.js b/binaries/data/mods/public/simulation/components/tests/test_TurretHolder.js index 773a4a70e4..8ca3335a76 100644 --- a/binaries/data/mods/public/simulation/components/tests/test_TurretHolder.js +++ b/binaries/data/mods/public/simulation/components/tests/test_TurretHolder.js @@ -139,18 +139,18 @@ cmpTurretHolder = ConstructComponent(turretHolderID, "TurretHolder", { let spawned = 100; Engine.AddEntity = function() { ++spawned; - if(spawned > 101) + if (spawned > 101) { ConstructComponent(spawned, "Turretable", {}); } - if(spawned > 102) + if (spawned > 102) { AddMock(spawned, IID_Ownership, { "GetOwner": () => player, "SetOwner": () => {} }); } - if(spawned > 103) + if (spawned > 103) { AddMock(spawned, IID_Position, { "GetPosition": () => new Vector3D(4, 3, 25), diff --git a/binaries/data/mods/public/simulation/helpers/Cheat.js b/binaries/data/mods/public/simulation/helpers/Cheat.js index 357b10d137..3ae62db10d 100644 --- a/binaries/data/mods/public/simulation/helpers/Cheat.js +++ b/binaries/data/mods/public/simulation/helpers/Cheat.js @@ -14,7 +14,7 @@ function Cheat(input) const cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface); const cmpPopulationManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PopulationCapManager); - switch(input.action) + switch (input.action) { case "addresource": if (isNaN(input.parameter)) diff --git a/binaries/data/mods/public/simulation/helpers/Commands.js b/binaries/data/mods/public/simulation/helpers/Commands.js index 35991c9e37..e4f857751a 100644 --- a/binaries/data/mods/public/simulation/helpers/Commands.js +++ b/binaries/data/mods/public/simulation/helpers/Commands.js @@ -41,7 +41,7 @@ var g_Commands = { if (!cmpDiplomacy || cmpDiplomacy.IsTeamLocked()) return; - switch(cmd.to) + switch (cmd.to) { case "ally": cmpDiplomacy.Ally(cmd.player); @@ -240,7 +240,7 @@ var g_Commands = { for (const ent of data.entities) { var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI); - if(!cmpUnitAI || !cmpUnitAI.BackToWork()) + if (!cmpUnitAI || !cmpUnitAI.BackToWork()) notifyBackToWorkFailure(player); } }, diff --git a/binaries/data/mods/public/simulation/helpers/InitGame.js b/binaries/data/mods/public/simulation/helpers/InitGame.js index 3db0154de5..bae56f9c48 100644 --- a/binaries/data/mods/public/simulation/helpers/InitGame.js +++ b/binaries/data/mods/public/simulation/helpers/InitGame.js @@ -49,7 +49,7 @@ function InitGame(settings) if (settings.PlayerData[i]) { - if(settings.PlayerData[i].Removed) + if (settings.PlayerData[i].Removed) { cmpPlayer.Defeat(undefined); continue; diff --git a/eslint.config.mjs b/eslint.config.mjs index 1ebc62e4e7..f918e39067 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -124,6 +124,7 @@ const configStylistic = { "@stylistic/comma-spacing": "warn", "@stylistic/indent": ["warn", "tab", { "outerIIFEBody": "off" }], "@stylistic/key-spacing": "warn", + "@stylistic/keyword-spacing": ["warn", { "before": true, "after": true }], "@stylistic/new-parens": "warn", "@stylistic/no-extra-parens": "off", "@stylistic/no-extra-semi": "warn", diff --git a/source/tools/profiler2/Profiler2Report.js b/source/tools/profiler2/Profiler2Report.js index 4ce6c30bb8..7a0b4d688e 100644 --- a/source/tools/profiler2/Profiler2Report.js +++ b/source/tools/profiler2/Profiler2Report.js @@ -218,7 +218,7 @@ class Profiler2Report if (data[i][0] == this.ITEM_LEAVE) stack.pop(); } - if(!range) + if (!range) { range = { "tmin": data[0][1], "tmax": data[data.length-1][1] }; }