Skip to content

Use grammalect-cli.py from PATH by default #19

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use grammalect-cli.py from PATH by default #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9aac6f
Default to grammalecte-cli.py from PATH
paulfariello-syn Jul 24, 2019
8620cd3
Fix Grammalecte download link
paulfariello-syn Jul 24, 2019
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
12 changes: 9 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,20 @@ this line in you ~/.vimrc:
To use this plugin, you need to install the Python Grammalecte program.
Grammalecte can be downloaded at:

http://www.dicollecte.org/grammalecte/telecharger.php
https://grammalecte.net/#download

This vim plugin requires Grammalecte version 0.5.12 or newer.

Unzip the Grammalecte-fr-v0.5.\*oxt file and specify the location
Unzip the Grammalecte-fr-v0.5.\*zip file install it with:

```
pip3 install .
```

If you don't want to install it you can specify the location
of Grammalecte into your ~/.vimrc file using something like:

let g:grammalecte_cli_py='~/Downloads/Grammalecte-fr-v0.5.14/pythonpath/cli.py'
let g:grammalecte_cmd='python3 ~/Downloads/Grammalecte-fr-v0.5.14/pythonpath/cli.py'

## Description ##

Expand Down
21 changes: 4 additions & 17 deletions plugin/Grammalecte.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,9 @@ function s:GrammalecteSetUp() "{{{1
\ ? g:grammalecte_win_height
\ : 14

let s:grammalecte_cli_py = exists("g:grammalecte_cli_py")
\ ? g:grammalecte_cli_py
\ : $HOME . '/grammalecte/pythonpath/cli.py'

if !filereadable(s:grammalecte_cli_py)
" Hmmm, can't find the python file. Try again with expand() in case user
" set it up as: let g:python_cli_py = '$HOME/grammalecte/pythonpath/cli.py'
let l:grammalecte_cli_py = expand(s:grammalecte_cli_py)
if !filereadable(expand(l:grammalecte_cli_py))
echomsg "Grammalecte cannot be found at: " . s:grammalecte_cli_py
echomsg "You need to install Grammalecte and/or set up g:grammalecte_cli_py"
echomsg "to indicate the location of the Grammalecte pythonpath/cli.py script."
return -1
endif
let s:grammalecte_cli_py = l:grammalecte_cli_py
endif
let s:grammalecte_cmd = exists("g:grammalecte_cmd")
\ ? g:grammalecte_cmd
\ : 'grammalecte-cli.py'

endfunction

Expand Down Expand Up @@ -147,7 +134,7 @@ function s:GrammalecteCheck(line1, line2) "{{{1
let l:range = a:line1 . ',' . a:line2
silent exe l:range . 'w!' . l:tmpfilename

let l:grammalecte_cmd = 'python3 ' . s:grammalecte_cli_py
let l:grammalecte_cmd = s:grammalecte_cmd
\ . ' -f ' . l:tmpfilename
\ . (empty(s:grammalecte_disable_rules) ? ' ' : (' -roff ' . s:grammalecte_disable_rules))
\ . ' -j -cl -owe -ctx 2> ' . l:tmperror
Expand Down