Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

Fix typos; should be non-semantic #1469

Merged
merged 1 commit into from
Nov 25, 2019
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
4 changes: 2 additions & 2 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
- Fix typos in Challenges.md
([#1329](https://github.com/haskell/haskell-ide-engine/pull/1329), by @mb720)

- Remove unnecesary extra-dep unix-time
- Remove unnecessary extra-dep unix-time
([#1326](https://github.com/haskell/haskell-ide-engine/pull/1326), by @jneira)

- Use hlint-2.2
Expand Down Expand Up @@ -439,7 +439,7 @@ is a complex effort, and will take some time, but is being tackled by

- LSP mode is now the default, and the `--lsp` flag has no effect
- The `--json` flag can be used for JSON transport
- HIE now warns you if there is mismatch between the HIE GHC verison and the project GHC version
- HIE now warns you if there is mismatch between the HIE GHC version and the project GHC version
- Add Liquid Haskell support
- Add support for hierarchical document symbols
- Add many new types of code actions
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ For brevity, only the `stack`-based commands are presented in the following sect

Although you can use hie for stack based projects (those which have a `stack.yaml` in the project base directory) without having cabal installed, you will need it for cabal based projects (with only a `<projectName>.cabal` file or a `cabal.project` one in the project base directory).

You can install an appropiate cabal version using stack by running:
You can install an appropriate cabal version using stack by running:

```bash
stack ./install.hs stack-install-cabal
Expand Down
2 changes: 1 addition & 1 deletion docs/Build.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Each `stack-*.yaml` contains references to packages in the submodules. Calling `

`hie` depends on a correct environment in order to function properly:

* `cabal-install`: This dependency is required by `hie` to handle correctly projects that are not `stack` based (without `stack.yaml`). You can install an appropiate version using `stack` with the `stack-install-cabal` target.
* `cabal-install`: This dependency is required by `hie` to handle correctly projects that are not `stack` based (without `stack.yaml`). You can install an appropriate version using `stack` with the `stack-install-cabal` target.
* The `hoogle` database: `hoogle generate` needs to be called with the most-recent `hoogle` version.

### Steps to build `hie`
Expand Down
2 changes: 1 addition & 1 deletion docs/Report-2015-12.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Both of these are well in hand, and if anyone would like to join in the discussi
- Create a diff type [#95](https://github.com/haskell/haskell-ide-engine/issues/95)
- Replace logging package [#112](https://github.com/haskell/haskell-ide-engine/issues/112)
- Split between haskell-ide-engine and haskell-plugin-api [#118](https://github.com/haskell/haskell-ide-engine/issues/118)
- Document existance of `module-management` package and ghc-vis [#124](https://github.com/haskell/haskell-ide-engine/issues/124)
- Document existence of `module-management` package and ghc-vis [#124](https://github.com/haskell/haskell-ide-engine/issues/124)
- Provide ghc-modi transport? [#125](https://github.com/haskell/haskell-ide-engine/issues/125)
- Sort out ghc-mod session management [#127](https://github.com/haskell/haskell-ide-engine/issues/127)
- Git integration [#128](https://github.com/haskell/haskell-ide-engine/issues/128)
Expand Down
2 changes: 1 addition & 1 deletion hie-plugin-api/Haskell/Ide/Engine/ModuleCache.hs
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ deleteCachedModule uri = do
-- | A ModuleCache is valid for the lifetime of a CachedModule
-- It is generated on need and the cache is invalidated
-- when a new CachedModule is loaded.
-- Allows the caching of arbitary data linked to a particular
-- Allows the caching of arbitrary data linked to a particular
-- TypecheckedModule.
-- TODO: this name is confusing, given GhcModuleCache. Change it
class Typeable a => ModuleCache a where
Expand Down
2 changes: 1 addition & 1 deletion hie-plugin-api/Haskell/Ide/Engine/PluginApi.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- | This module provides an API that software intented to be
-- | This module provides an API that software intended to be
-- integrated into HIE can use, so that they can make use of the
-- shared BIOS features.

Expand Down
4 changes: 2 additions & 2 deletions src/Haskell/Ide/Engine/Plugin/HsImport.hs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ codeActionProvider :: CodeActionProvider
codeActionProvider plId docId _ context = do
let J.List diags = context ^. J.diagnostics
terms = mapMaybe getImportables diags
-- Search for the given diagnostics and produce appropiate import actions.
-- Search for the given diagnostics and produce appropriate import actions.
actions <- importActionsForTerms Exact terms

if null actions
Expand All @@ -288,7 +288,7 @@ codeActionProvider plId docId _ context = do
-- e.g. instead of `take :: Int -> [a] -> [a]` use `take` as the search term.
--
-- List of Diagnostics with the associated term to look for.
-- Diagnostic that is supposed to import the appropiate term.
-- Diagnostic that is supposed to import the appropriate term.
--
-- Result may produce several import actions, or none.
importActionsForTerms
Expand Down
2 changes: 1 addition & 1 deletion src/Haskell/Ide/Engine/Transport/LspStdio.hs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ data DiagnosticsRequest = DiagnosticsRequest
-- ^ The current version of the document at the time of this request
}

-- | Represents the most recent occurance of a certin event. We use this
-- | Represents the most recent occurrence of a certin event. We use this
-- to diagnostics requests and only dispatch the most recent one.
newtype MostRecent a = MostRecent a

Expand Down