Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable spellcheck for TypeScript files #2930

Merged
merged 1 commit into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cspell.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -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/**",
Expand Down
28 changes: 22 additions & 6 deletions project-words
Original file line number Diff line number Diff line change
@@ -1,36 +1,40 @@
activestorage
autocorrect
Autocorrect
andyw8 marked this conversation as resolved.
Show resolved Hide resolved
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
Expand All @@ -39,8 +43,9 @@ Jaro
Kaigi
klass
kwargs
libexec
linearization
linearizes
Linearizes
linearizing
lockfiles
lspconfig
Expand All @@ -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
Expand All @@ -73,7 +81,9 @@ rubylibdir
rubylibprefix
setqflist
shadowenv
Shadowenv
shellwords
Shellwords
snode
somethi
spoom
Expand All @@ -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
2 changes: 1 addition & 1 deletion vscode/src/infoCollector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion vscode/src/rubyLsp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@
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, {
Expand Down Expand Up @@ -623,7 +623,7 @@
delete newConfig.useBundler;

const command = (newConfig.command || "").replace(
"${workspaceRoot}/",

Check warning on line 626 in vscode/src/rubyLsp.ts

View workflow job for this annotation

GitHub Actions / lint_node

Unexpected template string expression

Check warning on line 626 in vscode/src/rubyLsp.ts

View workflow job for this annotation

GitHub Actions / lint_node

Unexpected template string expression
"",
);
const script = newConfig.script || "";
Expand Down
4 changes: 2 additions & 2 deletions vscode/src/status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions vscode/src/test/suite/common.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions vscode/src/test/suite/status.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -287,18 +287,18 @@ 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", () => {
workspace.lspClient!.addons = [];
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 },
Expand All @@ -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);
});
Expand Down
2 changes: 1 addition & 1 deletion vscode/src/testController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading