From 70d69fc377fcfe798de258358b0cb1fa5f00dc7c Mon Sep 17 00:00:00 2001 From: Brian Wignall Date: Mon, 25 Nov 2019 12:17:06 -0500 Subject: [PATCH] Fix typos; should be non-semantic --- Changelog.md | 4 ++-- README.md | 2 +- docs/Build.md | 2 +- docs/Report-2015-12.md | 2 +- hie-plugin-api/Haskell/Ide/Engine/ModuleCache.hs | 2 +- hie-plugin-api/Haskell/Ide/Engine/PluginApi.hs | 2 +- src/Haskell/Ide/Engine/Plugin/HsImport.hs | 4 ++-- src/Haskell/Ide/Engine/Transport/LspStdio.hs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Changelog.md b/Changelog.md index c610a620f..13543bc35 100644 --- a/Changelog.md +++ b/Changelog.md @@ -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 @@ -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 diff --git a/README.md b/README.md index e9041bfae..d0c550cab 100644 --- a/README.md +++ b/README.md @@ -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 `.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 diff --git a/docs/Build.md b/docs/Build.md index 06f7a8190..25b265caf 100644 --- a/docs/Build.md +++ b/docs/Build.md @@ -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` diff --git a/docs/Report-2015-12.md b/docs/Report-2015-12.md index c3db9f0b5..56e461b43 100644 --- a/docs/Report-2015-12.md +++ b/docs/Report-2015-12.md @@ -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) diff --git a/hie-plugin-api/Haskell/Ide/Engine/ModuleCache.hs b/hie-plugin-api/Haskell/Ide/Engine/ModuleCache.hs index aa80778d2..29e281c8e 100644 --- a/hie-plugin-api/Haskell/Ide/Engine/ModuleCache.hs +++ b/hie-plugin-api/Haskell/Ide/Engine/ModuleCache.hs @@ -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 diff --git a/hie-plugin-api/Haskell/Ide/Engine/PluginApi.hs b/hie-plugin-api/Haskell/Ide/Engine/PluginApi.hs index 55bf6b61b..00d0a95b0 100644 --- a/hie-plugin-api/Haskell/Ide/Engine/PluginApi.hs +++ b/hie-plugin-api/Haskell/Ide/Engine/PluginApi.hs @@ -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. diff --git a/src/Haskell/Ide/Engine/Plugin/HsImport.hs b/src/Haskell/Ide/Engine/Plugin/HsImport.hs index a4d35abad..164708858 100644 --- a/src/Haskell/Ide/Engine/Plugin/HsImport.hs +++ b/src/Haskell/Ide/Engine/Plugin/HsImport.hs @@ -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 @@ -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 diff --git a/src/Haskell/Ide/Engine/Transport/LspStdio.hs b/src/Haskell/Ide/Engine/Transport/LspStdio.hs index ab7f9a022..02a276655 100644 --- a/src/Haskell/Ide/Engine/Transport/LspStdio.hs +++ b/src/Haskell/Ide/Engine/Transport/LspStdio.hs @@ -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