Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions lib/Container/CoreExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
use Phpactor\WorseReflection\SourceCodeLocator\StringSourceLocator;
use Phpactor\WorseReflection\SourceCodeLocator\StubSourceLocator;
use Phpactor\WorseReflection\SourceCodeLocator\ChainSourceLocator;
use Phpactor\CodeTransform\Adapter\WorseReflection\ImplementContracts;

class CoreExtension implements ExtensionInterface
{
Expand Down Expand Up @@ -360,5 +361,9 @@ private function registerTransform(Container $container)
$container->register('code_transform.transformer.complete_constructor', function (Container $container) {
return new CompleteConstructor();
}, [ 'code_transform.transformer' => [ 'name' => 'complete_constructor' ]]);

$container->register('code_transform.transformer.implement_contracts', function (Container $container) {
return new ImplementContracts($container->get('reflection.reflector'));
}, [ 'code_transform.transformer' => [ 'name' => 'implement_contracts' ]]);
}
}
27 changes: 0 additions & 27 deletions lib/Foobar.php

This file was deleted.

18 changes: 18 additions & 0 deletions plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,15 @@ map <Leader>pd :call phpactor#OffsetTypeInfo()<CR>
map <Leader>i :call phpactor#ReflectAtOffset()<CR>
map <Leader>pfm :call phpactor#MoveFile()<CR>
map <Leader>pfc :call phpactor#CopyFile()<CR>
map <Leader>tt :call phpactor#Transform()<CR>

" Show information about "type" under cursor including current frame
nnoremap <silent><Leader>i :call phpactor#OffsetTypeInfo()<CR>
```

**NOTE**: The above mappings are probably sub-optimal, feel free to find a
something that works for you.

Omni-completion
---------------

Expand Down Expand Up @@ -99,3 +103,17 @@ be inferred from it).
```
:call phpactor#ReflectAtOffset()
```

Transformations
---------------

![recording](https://user-images.githubusercontent.com/530801/27984415-92800230-63cd-11e7-8492-d5a7a93bb6f0.gif)

Apply transformations to the current buffer:

```
: call phpactor#Transform
1: complete_constructor
2: implement_contracts
Type number and <Enter> or click with mouse (empty cancels):
``
23 changes: 17 additions & 6 deletions plugin/phpactor.vim
Original file line number Diff line number Diff line change
Expand Up @@ -294,15 +294,26 @@ function! phpactor#OffsetTypeInfo()
echo out
endfunction

"""""""""""""""""""""
" Complete contructor
"""""""""""""""""""""
function! phpactor#CompleteConstructor()
""""""""""""""""""""""""
" Apply a transformation
""""""""""""""""""""""""
function! phpactor#Transform()

" TODO: Get the list of transforms from the PHP application
let transformations = [ 'complete_constructor', 'implement_contracts' ]

let list = []
let c = 1
for transformation in transformations
let list = add(list, c . ': ' . transformation)
let c = c + 1
endfor
let choice = inputlist(list)
let transform = transformations[choice - 1]

" START: Resolve FQN for class
let offset = line2byte(line('.')) + col('.') - 1
let stdin = join(getline(1,'$'), "\n")
let out = phpactor#ExecStdIn('class:transform stdin --transform=complete_constructor', stdin)
let out = phpactor#ExecStdIn('class:transform stdin --transform=' . transform, stdin)
let savePos = getpos(".")

if (empty(out))
Expand Down