diff --git a/cspell.jsonc b/cspell.jsonc index 341b68e30..d4c98159b 100644 --- a/cspell.jsonc +++ b/cspell.jsonc @@ -26,7 +26,7 @@ "addon$" // could have false positives but unlikely ], "language": "en", - "files": ["**/*.rb", "**/*.md", "**/*.markdown"], + "files": ["**/*.rb", "**/*.md", "**/*.markdown", "**/*.ts"], "ignorePaths": [ "**/node_modules/**", "vendor/**", diff --git a/project-words b/project-words index b7d9066b8..ac7dd8e02 100644 --- a/project-words +++ b/project-words @@ -1,36 +1,40 @@ activestorage autocorrect +Autocorrect autoloaded autorun bigdecimal bindir binmode binread +binstub Bizt Bizw bufnr -binstub bytesize byteslice codepoint codepoints concats copen +corge Corge +debuggee +Debuggee dont eglot Eglot eruby -exitstatus EXTGLOB +fakehome FIXEDENCODING Floo fnmatch fooo -gemname hostedtoolcache importmap indexables +Indexables ipairs Ispec Itest @@ -39,8 +43,9 @@ Jaro Kaigi klass kwargs +libexec linearization -linearizes +Linearizes linearizing lockfiles lspconfig @@ -52,12 +57,15 @@ nargs nodoc noreturn nvim +onig # abbreviation for oniguruma +Pacman +pathlist popen +qorge qtlzwssomeking quickfixes -quxx quux -qorge +quxx rdbg readlines realpath @@ -73,7 +81,9 @@ rubylibdir rubylibprefix setqflist shadowenv +Shadowenv shellwords +Shellwords snode somethi spoom @@ -83,14 +93,20 @@ stringio strscan subexpression supertypes +Supertypes suppo +truffleruby unaliased unindexed unparser unresolve Vinicius +vscodemachineid +vsctm Winkler +workdone XQRK yarp YARP +yjit YJIT diff --git a/vscode/src/infoCollector.ts b/vscode/src/infoCollector.ts index 9efc46006..566b08f22 100644 --- a/vscode/src/infoCollector.ts +++ b/vscode/src/infoCollector.ts @@ -50,7 +50,7 @@ async function gatherLspInfo( "VS Code Version": vscodeVersion, "Ruby LSP Extension Version": rubyLspExtensionVersion, "Ruby LSP Server Version": rubyLspVersion, - "Ruby LSP Addons": rubyLspAddons, + "Ruby LSP Add-ons": rubyLspAddons, "Ruby Version": workspace.ruby.rubyVersion ?? "Unknown", "Ruby Version Manager": workspace.ruby.versionManager.identifier, "Installed Extensions": extensions.sort(), diff --git a/vscode/src/rubyLsp.ts b/vscode/src/rubyLsp.ts index 3d66b587d..de297f590 100644 --- a/vscode/src/rubyLsp.ts +++ b/vscode/src/rubyLsp.ts @@ -462,7 +462,7 @@ export class RubyLsp { return openUris(rubySourceLocation); } - // Old format: we can remove after the Rails addon has been using the new format for a while + // Old format: we can remove after the Rails add-on has been using the new format for a while const [file, line] = rubySourceLocation; const workspace = this.currentActiveWorkspace(); return openFile(this.telemetry, workspace, { diff --git a/vscode/src/status.ts b/vscode/src/status.ts index 665546d7c..0cf989cc0 100644 --- a/vscode/src/status.ts +++ b/vscode/src/status.ts @@ -172,8 +172,8 @@ export class AddonsStatus extends StatusItem { constructor() { super("addons"); - this.item.name = "Ruby LSP Addons"; - this.item.text = "Fetching addon information"; + this.item.name = "Ruby LSP Add-ons"; + this.item.text = "Fetching add-on information"; } refresh(workspace: WorkspaceInterface): void { diff --git a/vscode/src/test/suite/common.test.ts b/vscode/src/test/suite/common.test.ts index db9443e86..a41504b2a 100644 --- a/vscode/src/test/suite/common.test.ts +++ b/vscode/src/test/suite/common.test.ts @@ -39,8 +39,8 @@ suite("Common", () => { }, } as any); - // For the fake machine of 42 in base 16 and the name `fakeFeature`, the feature flag activation percetange is - // 0.357. For every percetange below that, the feature should appear as disabled + // For the fake machine of 42 in base 16 and the name `fakeFeature`, the feature flag activation percentage is + // 0.357. For every percentage below that, the feature should appear as disabled [0.25, 0.3, 0.35].forEach((percentage) => { (FEATURE_FLAGS as any).fakeFeature = percentage; assert.strictEqual(featureEnabled("fakeFeature" as any), false); diff --git a/vscode/src/test/suite/status.test.ts b/vscode/src/test/suite/status.test.ts index cefb6ed17..fb16bfac8 100644 --- a/vscode/src/test/suite/status.test.ts +++ b/vscode/src/test/suite/status.test.ts @@ -287,7 +287,7 @@ suite("StatusItems", () => { status.item.text, "Addons: requires server to be v0.17.4 or higher to display this field", ); - assert.strictEqual(status.item.name, "Ruby LSP Addons"); + assert.strictEqual(status.item.name, "Ruby LSP Add-ons"); }); test("Status displays no addons when addons is an empty array", () => { @@ -295,10 +295,10 @@ suite("StatusItems", () => { status.refresh(workspace); assert.strictEqual(status.item.text, "Addons: none"); - assert.strictEqual(status.item.name, "Ruby LSP Addons"); + assert.strictEqual(status.item.name, "Ruby LSP Add-ons"); }); - test("Status displays addon count and command to list commands", () => { + test("Status displays add-on count and command to list commands", () => { workspace.lspClient!.addons = [ { name: "foo", errored: false }, { name: "bar", errored: true }, @@ -307,7 +307,7 @@ suite("StatusItems", () => { status.refresh(workspace); assert.strictEqual(status.item.text, "Addons: 2"); - assert.strictEqual(status.item.name, "Ruby LSP Addons"); + assert.strictEqual(status.item.name, "Ruby LSP Add-ons"); assert.strictEqual(status.item.command?.title, "Details"); assert.strictEqual(status.item.command.command, Command.DisplayAddons); }); diff --git a/vscode/src/testController.ts b/vscode/src/testController.ts index a31a5feb6..d4c7112ea 100644 --- a/vscode/src/testController.ts +++ b/vscode/src/testController.ts @@ -121,7 +121,7 @@ export class TestController { // Add nested group to its parent group const group = groupIdMap.get(data.group_id); - // If there's a mistake on the server or in an addon, a code lens may be produced for a non-existing group + // If there's a mistake on the server or in an add-on, a code lens may be produced for a non-existing group if (group) { group.children.add(testItem); } else {