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

Commit 11ed2ed

Browse files
authored
Merge pull request #1469 from bwignall/typo
Fix typos; should be non-semantic
2 parents c1e57f5 + 70d69fc commit 11ed2ed

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

Changelog.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
- Fix typos in Challenges.md
121121
([#1329](https://github.com/haskell/haskell-ide-engine/pull/1329), by @mb720)
122122

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

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

440440
- LSP mode is now the default, and the `--lsp` flag has no effect
441441
- The `--json` flag can be used for JSON transport
442-
- HIE now warns you if there is mismatch between the HIE GHC verison and the project GHC version
442+
- HIE now warns you if there is mismatch between the HIE GHC version and the project GHC version
443443
- Add Liquid Haskell support
444444
- Add support for hierarchical document symbols
445445
- Add many new types of code actions

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ For brevity, only the `stack`-based commands are presented in the following sect
220220

221221
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).
222222

223-
You can install an appropiate cabal version using stack by running:
223+
You can install an appropriate cabal version using stack by running:
224224

225225
```bash
226226
stack ./install.hs stack-install-cabal

docs/Build.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Each `stack-*.yaml` contains references to packages in the submodules. Calling `
3838

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

41-
* `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.
41+
* `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.
4242
* The `hoogle` database: `hoogle generate` needs to be called with the most-recent `hoogle` version.
4343

4444
### Steps to build `hie`

docs/Report-2015-12.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Both of these are well in hand, and if anyone would like to join in the discussi
6262
- Create a diff type [#95](https://github.com/haskell/haskell-ide-engine/issues/95)
6363
- Replace logging package [#112](https://github.com/haskell/haskell-ide-engine/issues/112)
6464
- Split between haskell-ide-engine and haskell-plugin-api [#118](https://github.com/haskell/haskell-ide-engine/issues/118)
65-
- Document existance of `module-management` package and ghc-vis [#124](https://github.com/haskell/haskell-ide-engine/issues/124)
65+
- Document existence of `module-management` package and ghc-vis [#124](https://github.com/haskell/haskell-ide-engine/issues/124)
6666
- Provide ghc-modi transport? [#125](https://github.com/haskell/haskell-ide-engine/issues/125)
6767
- Sort out ghc-mod session management [#127](https://github.com/haskell/haskell-ide-engine/issues/127)
6868
- Git integration [#128](https://github.com/haskell/haskell-ide-engine/issues/128)

hie-plugin-api/Haskell/Ide/Engine/ModuleCache.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ deleteCachedModule uri = do
307307
-- | A ModuleCache is valid for the lifetime of a CachedModule
308308
-- It is generated on need and the cache is invalidated
309309
-- when a new CachedModule is loaded.
310-
-- Allows the caching of arbitary data linked to a particular
310+
-- Allows the caching of arbitrary data linked to a particular
311311
-- TypecheckedModule.
312312
-- TODO: this name is confusing, given GhcModuleCache. Change it
313313
class Typeable a => ModuleCache a where

hie-plugin-api/Haskell/Ide/Engine/PluginApi.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- | This module provides an API that software intented to be
1+
-- | This module provides an API that software intended to be
22
-- integrated into HIE can use, so that they can make use of the
33
-- shared BIOS features.
44

src/Haskell/Ide/Engine/Plugin/HsImport.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ codeActionProvider :: CodeActionProvider
271271
codeActionProvider plId docId _ context = do
272272
let J.List diags = context ^. J.diagnostics
273273
terms = mapMaybe getImportables diags
274-
-- Search for the given diagnostics and produce appropiate import actions.
274+
-- Search for the given diagnostics and produce appropriate import actions.
275275
actions <- importActionsForTerms Exact terms
276276

277277
if null actions
@@ -288,7 +288,7 @@ codeActionProvider plId docId _ context = do
288288
-- e.g. instead of `take :: Int -> [a] -> [a]` use `take` as the search term.
289289
--
290290
-- List of Diagnostics with the associated term to look for.
291-
-- Diagnostic that is supposed to import the appropiate term.
291+
-- Diagnostic that is supposed to import the appropriate term.
292292
--
293293
-- Result may produce several import actions, or none.
294294
importActionsForTerms

src/Haskell/Ide/Engine/Transport/LspStdio.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ data DiagnosticsRequest = DiagnosticsRequest
100100
-- ^ The current version of the document at the time of this request
101101
}
102102

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

0 commit comments

Comments
 (0)