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.

Sign up for GitHub

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

Use https://github.com/google/vimdoc for helpfile generation #129

Closed
wants to merge 4 commits into from
Closed

Use https://github.com/google/vimdoc for helpfile generation #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f09376
Use https://github.com/google/vimdoc for helpfile generation
Dec 9, 2017
261d47a
Fix check for g:intero_stack_yaml
Dec 9, 2017
247e9da
Conform to vint suggestions
Dec 9, 2017
51ca442
Add addon-info.json
Dec 10, 2017
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: 6 additions & 0 deletions addon-info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"description": "\n\n\n _ _ _ ~\n (_)_ __ | |_ ___ _ __ ___ _ __ ___ _____ _(_)_ __ ___ ~\n | | '_ \\| __/ _ \\ '__/ _ \\ _____| '_ \\ / _ \\/ _ \\ \\ / / | '_ ` _ \\ ~\n | | | | | || __/ | | (_) |_____| | | | __/ (_) \\ V /| | | | | | |~\n |_|_| |_|\\__\\___|_| \\___/ |_| |_|\\___|\\___/ \\_/ |_|_| |_| |_|~\n ~\n\n Complete interactive program development for Haskell\n\n",
"author": "Matt Parsons <https://github.com/parsonsmatt/intero-neovim>",
"name": "intero",
"repository": {"type": "git", "url": "https://github.com/parsonsmatt/intero-neovim"}
}
4 changes: 0 additions & 4 deletions after/ftplugin/haskell/intero.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ if exists('b:did_ftplugin_intero') && b:did_ftplugin_intero
endif
let b:did_ftplugin_intero = 1

if !exists('g:intero_start_immediately')
let g:intero_start_immediately = 1
endif

if g:intero_start_immediately
call intero#process#start()
endif
Expand Down
11 changes: 2 additions & 9 deletions autoload/intero/process.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function! intero#process#initialize() abort
endif

" Find stack.yaml
if (!exists('g:intero_stack_yaml'))
if g:intero_stack_yaml ==# ''
" If there's a STACK_YAML environment variable, try to interpret
" that.
let l:should_cd_to_current_file = empty($STACK_YAML)
Expand Down Expand Up @@ -222,10 +222,7 @@ function! s:start_buffer(height) abort
" ID of the buffer.
exe 'below ' . a:height . ' split'

let l:invocation = 'ghci --with-ghc intero'
if exists('g:intero_ghci_options')
let l:invocation .= ' --ghci-options="' . g:intero_ghci_options . '"'
endif
let l:invocation = 'ghci --with-ghc intero' . g:intero_ghci_options

enew
silent call termopen('stack '
Expand All @@ -248,10 +245,6 @@ function! s:start_buffer(height) abort
endfunction

function! s:on_stdout(jobid, lines, event) abort
if !exists('g:intero_prompt_regex')
let g:intero_prompt_regex = '[^-]> '
endif

for l:line_seg in a:lines
let s:current_line = s:current_line . l:line_seg

Expand Down
5 changes: 0 additions & 5 deletions autoload/intero/targets.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ scriptencoding utf-8
" component of a Haskell package.
"""""""""""

if (!exists('g:intero_load_targets'))
" A list of load targets.
let g:intero_load_targets = []
endif

if (!exists('g:intero_stack_targets'))
" A cached list of the stack targets.
let g:intero_stack_targets = []
Expand Down
Loading