Diffusion libphutil d20d6e725037

Fix an issue with highlighting PHP snippets with leading whitespace using XHPAST
d20d6e725037
Actions

Description

Fix an issue with highlighting PHP snippets with leading whitespace using XHPAST

Summary:
Ref T10576. In the test case there, XHPAST has incorrectly emitted an extra newline at the top of the output.

This cascades downward and throws every line off by one, highlighting the wrong lines in the output.

Fix this issue by stripping the prefix more carefully, so the input source is preserved accurately.

Test Plan:

Added tests; ran tests.
Verified that the snippet now highlights correctly.

Screen Shot 2016-03-13 at 7.05.29 AM.png (890×2 px, 195 KB)

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10576

Differential Revision: https://secure.phabricator.com/D15469

Details

Provenance

epriestley	Authored on Mar 13 2016, 2:00 PM
epriestley	Pushed on Mar 13 2016, 2:44 PM

Reviewer

chad

Differential Revision

D15469: Fix an issue with highlighting PHP snippets with leading whitespace using XHPAST

Parents

rPHUf5f44f3a2c0b: Allow Remarkup tables to have leading space so they work correctly with quoting

Branches

Unknown

Tags

Unknown

Tasks

T10576: Wrong highlighting for manually uploaded diff

Build Status

Buildable 11148
Build 13819: Run Core Tests

Event Timeline

epriestley committed rPHUd20d6e725037: Fix an issue with highlighting PHP snippets with leading whitespace using XHPAST (authored by epriestley).Mar 13 2016, 2:44 PM

epriestley added a task: T10576: Wrong highlighting for manually uploaded diff.

Harbormaster completed building B11148: rPHUd20d6e725037: Fix an issue with highlighting PHP snippets with leading whitespace using XHPAST.Mar 13 2016, 2:44 PM

r0bbie mentioned this in T10611: No option to specify a Space when editing a Project's visibility policy.Mar 17 2016, 4:02 PM

hyOzd mentioned this in T10859: Wiki page title is not updated in preview.Apr 23 2016, 12:54 PM

abeer mentioned this in T10980: Code coverage details on Phab.May 17 2016, 11:12 PM

zhiyuchen mentioned this in T11204: Sometimes maniphest status is not correctly updated after maniphest.update conduit api call returns success response.Jun 23 2016, 9:26 PM

Changes (13)

Path

Size

.arclint

src/

markup/

syntax/

highlighter/

PhutilXHPASTSyntaxHighlighter.php

__tests__/

PhutilXHPASTSyntaxHighlighterTestCase.php

phpfragment/

leading-whitespace.expect

leading-whitespace.test

no-leading-whitespace.expect

no-leading-whitespace.test

xhpast/

leading-whitespace.expect

leading-whitespace.source

no-leading-whitespace.expect

no-leading-whitespace.source

xhpast/

PhutilXHPASTSyntaxHighlighterFuture.php

parser/

aast/

api/

AASTToken.php

rPHUd20d6e725037

View Options

.arclint

View Options

src/markup/syntax/highlighter/PhutilXHPASTSyntaxHighlighter.php

View Options

src/markup/syntax/highlighter/tests/PhutilXHPASTSyntaxHighlighterTestCase.php

View Options

src/markup/syntax/highlighter/tests/phpfragment/leading-whitespace.expect

View Options

src/markup/syntax/highlighter/tests/phpfragment/leading-whitespace.test

View Options

src/markup/syntax/highlighter/tests/phpfragment/no-leading-whitespace.expect

View Options

src/markup/syntax/highlighter/tests/phpfragment/no-leading-whitespace.test

View Options

src/markup/syntax/highlighter/tests/xhpast/leading-whitespace.expect

View Options

src/markup/syntax/highlighter/tests/xhpast/leading-whitespace.source

View Options

src/markup/syntax/highlighter/tests/xhpast/no-leading-whitespace.expect

View Options

src/markup/syntax/highlighter/tests/xhpast/no-leading-whitespace.source

View Options

src/markup/syntax/highlighter/xhpast/PhutilXHPASTSyntaxHighlighterFuture.php

View Options

src/parser/aast/api/AASTToken.php

Fix an issue with highlighting PHP snippets with leading whitespace using XHPASTd20d6e725037Actions

Description

Details

Event Timeline

Changes (13)

rPHUd20d6e725037

.arclint

src/markup/syntax/highlighter/PhutilXHPASTSyntaxHighlighter.php

src/markup/syntax/highlighter/__tests__/PhutilXHPASTSyntaxHighlighterTestCase.php

src/markup/syntax/highlighter/__tests__/phpfragment/leading-whitespace.expect

src/markup/syntax/highlighter/__tests__/phpfragment/leading-whitespace.test

src/markup/syntax/highlighter/__tests__/phpfragment/no-leading-whitespace.expect

src/markup/syntax/highlighter/__tests__/phpfragment/no-leading-whitespace.test

src/markup/syntax/highlighter/__tests__/xhpast/leading-whitespace.expect

src/markup/syntax/highlighter/__tests__/xhpast/leading-whitespace.source

src/markup/syntax/highlighter/__tests__/xhpast/no-leading-whitespace.expect

src/markup/syntax/highlighter/__tests__/xhpast/no-leading-whitespace.source

src/markup/syntax/highlighter/xhpast/PhutilXHPASTSyntaxHighlighterFuture.php

src/parser/aast/api/AASTToken.php

Fix an issue with highlighting PHP snippets with leading whitespace using XHPAST
d20d6e725037
Actions

src/markup/syntax/highlighter/tests/PhutilXHPASTSyntaxHighlighterTestCase.php

src/markup/syntax/highlighter/tests/phpfragment/leading-whitespace.expect

src/markup/syntax/highlighter/tests/phpfragment/leading-whitespace.test

src/markup/syntax/highlighter/tests/phpfragment/no-leading-whitespace.expect

src/markup/syntax/highlighter/tests/phpfragment/no-leading-whitespace.test

src/markup/syntax/highlighter/tests/xhpast/leading-whitespace.expect

src/markup/syntax/highlighter/tests/xhpast/leading-whitespace.source

src/markup/syntax/highlighter/tests/xhpast/no-leading-whitespace.expect

src/markup/syntax/highlighter/tests/xhpast/no-leading-whitespace.source