Commit eae961c

caufangondrejmirtes

authored and

committed

Ensure that JetBrains terminal sees correct relative path.

1 parent 7b001c8 commit eae961cCopy full SHA for eae961c

File tree

+25

-1

lines changed

+25

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function formatErrors(`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`if (getenv('TERMINAL_EMULATOR') === 'JetBrains-JediTerm') {`
`113`		`- $title = $this->relativePathHelper->getRelativePath($filePath);`
	`113`	`+ $title = $this->simpleRelativePathHelper->getRelativePath($filePath);`
`114`	`114`	`$message .= sprintf("\nat %s:%d", $title, $error->getLine() ?? 0);`
`115`	`115`
`116`	`116`	`} elseif (is_string($this->editorUrl)) {`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,30 @@ public function testBug13317(): void`
`424`	`424`	`);`
`425`	`425`	`}`
`426`	`426`
	`427`	`+ public function testJetBrainsTerminalRelativePath(): void`
	`428`	`+ {`
	`429`	`+ putenv('TERMINAL_EMULATOR=JetBrains-JediTerm');`
	`430`	`+`
	`431`	`+ // FuzzyRelativePathHelper trims path segments based on analysed paths.`
	`432`	`+ $relativePathHelper = new FuzzyRelativePathHelper(new NullRelativePathHelper(), self::DIRECTORY_PATH, [self::DIRECTORY_PATH . '/rel'], '/');`
	`433`	`+`
	`434`	`+ $formatter = new TableErrorFormatter(`
	`435`	`+ $relativePathHelper,`
	`436`	`+ new SimpleRelativePathHelper(self::DIRECTORY_PATH),`
	`437`	`+ new CiDetectedErrorFormatter(`
	`438`	`+ new GithubErrorFormatter($relativePathHelper),`
	`439`	`+ new TeamcityErrorFormatter($relativePathHelper),`
	`440`	`+ ),`
	`441`	`+ false,`
	`442`	`+ null,`
	`443`	`+ null,`
	`444`	`+ );`
	`445`	`+ $error = new Error('Test', 'Foo.php', 12, filePath: self::DIRECTORY_PATH . '/rel/Foo.php');`
	`446`	`+ $formatter->formatErrors(new AnalysisResult([$error], [], [], [], [], false, null, true, 0, false, []), $this->getOutput(true));`
	`447`	`+`
	`448`	`+ $this->assertStringContainsString('at rel/Foo.php:12', $this->getOutputContent(true));`
	`449`	`+ }`
	`450`	`+`
`427`	`451`	`private function createErrorFormatter(?string $editorUrl, ?string $editorUrlTitle = null): TableErrorFormatter`
`428`	`452`	`{`
`429`	`453`	`$relativePathHelper = new FuzzyRelativePathHelper(new NullRelativePathHelper(), self::DIRECTORY_PATH, [], '/');`

Comments

(0)