Skip to content

Fix typos #594

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

Merged
merged 1 commit into from
Aug 19, 2021
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
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Bug Fixes:
### v0.6.3: 30 January 2021

Improvements:
- Add support for `textDocument/implementation` ("Go to Implmentations" and "Peek Implementations") (thanks [Łukasz Samson](https://github.com/lukaszsamson)) [#415](https://github.com/elixir-lsp/elixir-ls/pull/415)
- Add support for `textDocument/implementation` ("Go to Implementations" and "Peek Implementations") (thanks [Łukasz Samson](https://github.com/lukaszsamson)) [#415](https://github.com/elixir-lsp/elixir-ls/pull/415)
- More specific `CompletionItemKind` for autocomplete (thanks [Jason Axelson](https://github.com/axelson)) [#419](https://github.com/elixir-lsp/elixir-ls/pull/419)
- Support ASDF installed via homebrew on macOS (thanks [Fabian Stegemann](https://github.com/zetaron)) [#428](https://github.com/elixir-lsp/elixir-ls/pull/428)
- Make launcher script more robust and support symlinks (thanks [Joshua Trees](https://github.com/jtrees)) [#445](https://github.com/elixir-lsp/elixir-ls/pull/445)
Expand Down Expand Up @@ -213,7 +213,7 @@ Changes:
Bug Fixes:
- Formatting was returning invalid floating point number (thanks [Thanabodee Charoenpiriyakij](https://github.com/wingyplus)) [#250](https://github.com/elixir-lsp/elixir-ls/pull/250)
- Fix detection of empty hover hints (thanks [Dmitry Gutov](https://github.com/dgutov)) [#279](https://github.com/elixir-lsp/elixir-ls/pull/279)
- Debugger doesn't fail when modules cannot be interpretted (thanks [Łukasz Samson](https://github.com/lukaszsamson)) (such as nifs) [#283](https://github.com/elixir-lsp/elixir-ls/pull/283)
- Debugger doesn't fail when modules cannot be interpreted (thanks [Łukasz Samson](https://github.com/lukaszsamson)) (such as nifs) [#283](https://github.com/elixir-lsp/elixir-ls/pull/283)
- Do not advertise `workspaceFolders` support (thanks [Jason Axelson](https://github.com/axelson)) [#298](https://github.com/elixir-lsp/elixir-ls/pull/298)
- Do not try to create gitignore when project dir not set (thanks [Łukasz Samson](https://github.com/lukaszsamson)) [#306](https://github.com/elixir-lsp/elixir-ls/pull/306)
- Only call DocumentSymbols (outline pane) for .ex and .exs files (thanks [Marlus Saraiva](https://github.com/msaraiva)) [#262](https://github.com/elixir-lsp/elixir-ls/pull/262)
Expand Down Expand Up @@ -388,7 +388,7 @@ VSCode:

- Fix compatibility with Elixir 1.9
- Fix bug where Mix file is not reloaded on change if it had errors
- Remove unneccessary empty parens from suggested specs
- Remove unnecessary empty parens from suggested specs
- Add 'dialyzerFormat' setting to select which warning formatter to use. Options are `"dialyzer"` (default), `"dialyxir_short"`, `"dialyxir_long"`
- (VS Code) Support syntax highlighting in Phoenix LiveView (.leex) files, including ~L sigil (Thanks to @rrichardsonv)
- (VS Code) Improved syntax highlighting and other automatic behavior (Thanks to @crbelaus)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ In order to debug modules in `.exs` files (such as tests), they must be specifie
}
```

In order to debug a single test or a single test file it is currently necessary to modify `taskArgs` and make sure no other tests are requred in `requireFiles`.
In order to debug a single test or a single test file it is currently necessary to modify `taskArgs` and make sure no other tests are required in `requireFiles`.

```
{
Expand Down Expand Up @@ -186,7 +186,7 @@ The completions include:
- modules
- variables
- struct fields (only if the struct type is explicitly stated or can be inferred from the variable binding)
- atom map keys (if map keys can be infered from variable binding)
- atom map keys (if map keys can be inferred from variable binding)
- attributes
- types (in typespecs)
- behaviour callbacks (inside the body of implementing module)
Expand Down
6 changes: 3 additions & 3 deletions apps/elixir_ls_debugger/test/debugger_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ defmodule ElixirLS.Debugger.ServerTest do
end

describe "initialize" do
test "succeedes", %{server: server} do
test "succeeds", %{server: server} do
Server.receive_packet(server, initialize_req(1, %{"clientID" => "some_id"}))
assert_receive(response(_, 1, "initialize", %{"supportsConfigurationDoneRequest" => true}))
assert :sys.get_state(server).client_info == %{"clientID" => "some_id"}
Expand Down Expand Up @@ -70,15 +70,15 @@ defmodule ElixirLS.Debugger.ServerTest do
end

describe "disconnect" do
test "succeedes when not initialized", %{server: server} do
test "succeeds when not initialized", %{server: server} do
Process.flag(:trap_exit, true)
Server.receive_packet(server, request(1, "disconnect"))
assert_receive(response(_, 1, "disconnect", %{}))
assert_receive({:EXIT, ^server, {:exit_code, 0}})
Process.flag(:trap_exit, false)
end

test "succeedes when initialized", %{server: server} do
test "succeeds when initialized", %{server: server} do
Process.flag(:trap_exit, true)
Server.receive_packet(server, initialize_req(1, %{"clientID" => "some_id"}))
assert_receive(response(_, 1, "initialize", %{"supportsConfigurationDoneRequest" => true}))
Expand Down
2 changes: 1 addition & 1 deletion apps/elixir_ls_utils/test/support/mix_test.case.ex
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ defmodule ElixirLS.Utils.MixTest.Case do
end

def capture_log_and_io(device, fun) when is_function(fun, 0) do
# Logger gets stopped during some tests so restart it to be able to capture logs (and keept the
# Logger gets stopped during some tests so restart it to be able to capture logs (and kept the
# test output clean)
Application.ensure_started(:logger)

Expand Down
2 changes: 1 addition & 1 deletion apps/language_server/lib/language_server/server.ex
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defmodule ElixirLS.LanguageServer.Server do
This server tracks open files, attempts to rebuild the project when a file changes, and handles
requests from the IDE (for things like autocompletion, hover, etc.)

Notifications from the IDE are handled synchronously, whereas requests can be handled sychronously
Notifications from the IDE are handled synchronously, whereas requests can be handled synchronously
or asynchronously.

When possible, handling the request asynchronously has several advantages. The asynchronous
Expand Down
22 changes: 11 additions & 11 deletions apps/language_server/test/providers/document_symbols_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -2023,7 +2023,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
text = ~S[
defmodule MyModuleTest do
use ExUnit.Case
describe "some descripton" do
describe "some description" do
test "does something", do: :ok
end
end
Expand All @@ -2050,7 +2050,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
}
],
kind: 12,
name: "describe \"some descripton\"",
name: "describe \"some description\"",
range: %{
end: %{character: 8, line: 3},
start: %{character: 8, line: 3}
Expand Down Expand Up @@ -2080,7 +2080,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
text = ~S[
defmodule MyModuleTest do
use ExUnit.Case
describe ~S(some "descripton") do
describe ~S(some "description") do
test "does" <> "something", do: :ok
end
end
Expand Down Expand Up @@ -2132,9 +2132,9 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
]} = DocumentSymbols.symbols(uri, text, true)

if System.version() |> Version.match?(">= 1.10.0") do
assert describe_sigil == "describe ~S(some \"descripton\")"
assert describe_sigil == "describe ~S(some \"description\")"
else
assert describe_sigil == "describe ~S'some \"descripton\"'"
assert describe_sigil == "describe ~S'some \"description\"'"
end
end

Expand All @@ -2143,7 +2143,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
text = ~S[
defmodule MyModuleTest do
use ExUnit.Case
describe "some descripton" do
describe "some description" do
test "does something", do: :ok
end
end
Expand All @@ -2159,7 +2159,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
}
},
%Protocol.SymbolInformation{
name: "describe \"some descripton\"",
name: "describe \"some description\"",
kind: 12,
location: %{
range: %{end: %{character: 8, line: 3}, start: %{character: 8, line: 3}}
Expand All @@ -2172,7 +2172,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
location: %{
range: %{end: %{character: 10, line: 4}, start: %{character: 10, line: 4}}
},
containerName: "describe \"some descripton\""
containerName: "describe \"some description\""
}
]} = DocumentSymbols.symbols(uri, text, false)
end
Expand All @@ -2182,7 +2182,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
text = ~S[
defmodule MyModuleTest do
use ExUnit.Case
describe ~S(some "descripton") do
describe ~S(some "description") do
test "does" <> "something", do: :ok
end
end
Expand Down Expand Up @@ -2216,9 +2216,9 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
]} = DocumentSymbols.symbols(uri, text, false)

if System.version() |> Version.match?(">= 1.10.0") do
assert describe_sigil == "describe ~S(some \"descripton\")"
assert describe_sigil == "describe ~S(some \"description\")"
else
assert describe_sigil == "describe ~S'some \"descripton\"'"
assert describe_sigil == "describe ~S'some \"description\"'"
end
end

Expand Down
2 changes: 1 addition & 1 deletion apps/language_server/test/source_file_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ defmodule ElixirLS.LanguageServer.SourceFileTest do
assert SourceFile.lines_with_endings("") == [{"", nil}]
end

test "begining with endline" do
test "beginning with endline" do
assert SourceFile.lines_with_endings("\n") == [{"", "\n"}, {"", nil}]
assert SourceFile.lines_with_endings("\nbasic") == [{"", "\n"}, {"basic", nil}]
end
Expand Down
2 changes: 1 addition & 1 deletion apps/language_server/test/support/text_loc.ex
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ defmodule ElixirLS.Test.TextLoc do
if actual == unquote(expected) do
assert actual == unquote(expected)
else
IO.puts("Acutal is:")
IO.puts("Actual is:")
IO.puts(["\"\"\"", "\n", actual, "\"\"\""])
assert actual == unquote(expected)
end
Expand Down
4 changes: 2 additions & 2 deletions guides/initialization.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# LSP Server initialization

When launching the elixir_ls server using the scripts, the intialization steps are like:
When launching the elixir_ls server using the scripts, the initialization steps are like:

1. Replace default IO with Json RPC notifications
2. Starts Mix
Expand Down Expand Up @@ -43,7 +43,7 @@ After this `GenServer` is started, the next in line is the `ElixirLS.LanguageSer

## Overrides default Mix.Shell

Mix might have some "yes or no" questions that would not be possible to reply in the LSP paradigm. So, the server replaces the default `Mix.Shell` for providing the yes/no questions through LSP request/reponses. This way the client can show them to the user through its interface and pass back the response to the server.
Mix might have some "yes or no" questions that would not be possible to reply in the LSP paradigm. So, the server replaces the default `Mix.Shell` for providing the yes/no questions through LSP request/responses. This way the client can show them to the user through its interface and pass back the response to the server.

## Ensure the Hex version is accepted

Expand Down