Skip to content

Fix/#1085 status does not use correct working directory #1127

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

Merged
dantleech merged 2 commits into from
Nov 15, 2020
Merged

Fix/#1085 status does not use correct working directory #1127

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
b76ac9e
fix phpactor#Status() that didn't use --working-dir
camilledejoye Nov 15, 2020
ea9b038
Phpactor::boot() does not handle --working-dir properly
camilledejoye Nov 15, 2020
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
7 changes: 6 additions & 1 deletion autoload/phpactor.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,12 @@ endfunction

function! phpactor#Status()
if exists(':terminal')
let l:cmd = g:phpactorPhpBin . ' ' . g:phpactorbinpath . ' status'
let l:workspaceDir = phpactor#getRootDirectory()

" note that we should escape these arguments, but using the list syntax
" here causes tests to fail on travis with VIM 8.3 ...
let l:cmd = g:phpactorPhpBin . ' ' . g:phpactorbinpath . ' status --working-dir=' . l:workspaceDir

if has('nvim')
execute 'split term://' . l:cmd
" Press any key to leave
Expand Down
12 changes: 8 additions & 4 deletions lib/Phpactor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,19 @@ public static function boot(InputInterface $input, string $vendorDir): Container
{
$config = [];

$cwd = getcwd();
$projectRoot = getcwd();

if ($input->hasParameterOption([ '--working-dir', '-d' ])) {
$projectRoot = $input->getParameterOption([ '--working-dir', '-d' ]);
}

$loader = ConfigLoaderBuilder::create()
->enableJsonDeserializer('json')
->enableYamlDeserializer('yaml')
->addXdgCandidate('phpactor', 'phpactor.json', 'json')
->addXdgCandidate('phpactor', 'phpactor.yml', 'yaml')
->addCandidate($cwd . '/.phpactor.json', 'json')
->addCandidate($cwd . '/.phpactor.yml', 'yaml')
->addCandidate($projectRoot . '/.phpactor.json', 'json')
->addCandidate($projectRoot . '/.phpactor.yml', 'yaml')
->loader();

$config = $loader->load();
Expand All @@ -82,7 +86,7 @@ public static function boot(InputInterface $input, string $vendorDir): Container
$config = self::configureLanguageServer($config);

if ($input->hasParameterOption([ '--working-dir', '-d' ])) {
$config[FilePathResolverExtension::PARAM_PROJECT_ROOT] = $cwd = $input->getParameterOption([ '--working-dir', '-d' ]);
$config[FilePathResolverExtension::PARAM_PROJECT_ROOT] = $projectRoot;
}

if (!isset($config[CoreExtension::PARAM_XDEBUG_DISABLE]) || $config[CoreExtension::PARAM_XDEBUG_DISABLE]) {
Expand Down