Skip to content

Commit

Permalink
[B] ocaml#1804 vim: remove references to MerlinPhrase
Browse files Browse the repository at this point in the history
  • Loading branch information
voodoos committed Sep 25, 2024
1 parent fad6d1c commit 1cf98cc
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 28 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ unreleased
- Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (#1795, fixes #1794)
+ editor modes
- vim: fix python-3.12 syntax warnings in merlin.py (#1798)
- vim: Dead code / doc removal for previously deleted MerlinPhrase command (#1804)

merlin 4.16
===========
Expand Down
22 changes: 0 additions & 22 deletions vim/merlin/autoload/merlin.vim
Original file line number Diff line number Diff line change
Expand Up @@ -662,20 +662,6 @@ function! merlin#setVisualSelection(a, b)
call setpos("'b", markBSave)
endfunction

let s:phrase_counter = 0

function! merlin#Phrase()
if s:phrase_counter
let s:phrase_counter = s:phrase_counter - 1
else
let [l1, c1] = getpos("'<")[1:2]
let [l2, c2] = getpos("'>")[1:2]
let s:phrase_counter = l2 - l1
MerlinPy merlin.vim_selectphrase("l1","c1","l2","c2")
call merlin#setVisualSelection([l1,c1],[l2,c2])
endif
endfunction

function! merlin#Register()
if @% == ":merlin-type-history:"
return
Expand Down Expand Up @@ -807,10 +793,6 @@ function! merlin#Register()
command! -buffer -nargs=0 MerlinGotoDotMerlin call merlin#GotoDotMerlin()
command! -buffer -nargs=0 MerlinEchoDotMerlin call merlin#EchoDotMerlin()

""" 'semantic movement' -----------------------------------------------------
" TODO: bind (,),{,} ?
command! -buffer -nargs=0 MerlinPhrase call merlin#Phrase()

""" Polarity search
command! -buffer -complete=customlist,merlin#ExpandTypePrefix -nargs=+ MerlinSearch call merlin#PolaritySearch(0,<q-args>)

Expand All @@ -819,10 +801,6 @@ function! merlin#Register()
command! -buffer -nargs=0 MerlinDebugDisable call merlin#DebugDisable()
command! -buffer -nargs=0 MerlinDebugEnable call merlin#DebugEnable()

if !exists('g:merlin_disable_default_keybindings') || !g:merlin_disable_default_keybindings
vmap <silent><buffer> <TAB> :<C-u>MerlinPhrase<return>
endif

call merlin#LoadProject()
endfunction

Expand Down
6 changes: 0 additions & 6 deletions vim/merlin/doc/merlin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,6 @@ environment which name matches the user input.

Hitting enter will move you to the definition of the selected element.

:MerlinPhrase *:MerlinPhrase*
Selects the current phrase.


Bound to <TAB> by default in visual mode.

:MerlinErrorCheck *:MerlinErrorCheck*

Perform a fast type check of the current file, displaying the error
Expand Down

0 comments on commit 1cf98cc

Please sign in to comment.