Differential D15469

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

Authored by epriestley on Mar 13 2016, 2:07 PM.

Details

Reviewers

chad

Maniphest Tasks

T10576: Wrong highlighting for manually uploaded diff

Commits

rPHUd20d6e725037: 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)

Diff Detail

Repository

rPHU libphutil

Branch

hsnippet1

Lint

Lint Passed

Unit

Tests Passed

Build Status

Buildable 11147
Build 13818: Run Core Tests
Build 13817: arc lint + arc unit

Event Timeline

epriestley updated this revision to Diff 37282.Mar 13 2016, 2:07 PM

epriestley retitled this revision from to Fix an issue with highlighting PHP snippets with leading whitespace using XHPAST.

epriestley updated this object.

epriestley edited the test plan for this revision. (Show Details)

epriestley added a reviewer: chad.

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

Herald edited edge metadata. · View Herald TranscriptMar 13 2016, 2:07 PM

epriestley mentioned this in T10576: Wrong highlighting for manually uploaded diff.Mar 13 2016, 2:17 PM

chad accepted this revision.Mar 13 2016, 2:43 PM

chad edited edge metadata.

This revision is now accepted and ready to land.Mar 13 2016, 2:43 PM

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

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

.arclint

14 lines

src/

markup/

syntax/

highlighter/

PhutilXHPASTSyntaxHighlighter.php

2 lines

__tests__/

PhutilXHPASTSyntaxHighlighterTestCase.php

8 lines

phpfragment/

leading-whitespace.expect

3 lines

leading-whitespace.test

3 lines

no-leading-whitespace.expect

3 lines

no-leading-whitespace.test

3 lines

xhpast/

leading-whitespace.expect

3 lines

leading-whitespace.source

3 lines

no-leading-whitespace.expect

3 lines

no-leading-whitespace.source

3 lines

xhpast/

PhutilXHPASTSyntaxHighlighterFuture.php

40 lines

parser/

aast/

api/

AASTToken.php

5 lines

Diff 37282

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 XHPASTClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 37282

.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
ClosedPublic
Actions

Revision Contents
Changeset List

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