Bug 108697

Summary: Web Inspector: highlight matching braces in DTE.
Product: WebKit Reporter: Andrey Lushnikov <lushnikov>
Component: Web Inspector (Deprecated)Assignee: Andrey Lushnikov <lushnikov>
Status: RESOLVED FIXED    
Severity: Normal CC: apavlov, buildbot, dglazkov, keishi, loislo, pfeldman, pmuellr, rniwa, vsevik, web-inspector-bugs, webkit.review.bot, yurys
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: All   
OS: All   
Bug Depends on: 108685, 108692    
Bug Blocks:    
Attachments:
Description Flags
Patch
none
Cursor inside OR block
none
Patch
none
Patch
none
Patch
none
Patch none

Andrey Lushnikov
Reported 2013-02-01 14:35:31 PST
Highlight matching braces in DefaultTextEditor: - when cursor on a curly/round brace, highlight matching one - when cursor not on a curly/round brace, highlight enclosing braces
Attachments
Patch (22.08 KB, patch)
2013-02-01 15:07 PST, Andrey Lushnikov 		no flags
DetailsFormatted DiffDiff
Cursor inside OR block (5.13 KB, image/png)
2013-02-01 15:07 PST, Andrey Lushnikov 		no flags
Details
Patch (23.18 KB, patch)
2013-02-05 03:40 PST, Andrey Lushnikov 		no flags
DetailsFormatted DiffDiff
Patch (31.62 KB, patch)
2013-02-06 01:20 PST, Andrey Lushnikov 		no flags
DetailsFormatted DiffDiff
Patch (31.64 KB, patch)
2013-02-06 04:47 PST, Andrey Lushnikov 		no flags
DetailsFormatted DiffDiff
Patch (33.38 KB, patch)
2013-02-06 07:43 PST, Andrey Lushnikov 		no flags
DetailsFormatted DiffDiff
Show Obsolete (4) View All Add attachment proposed patch, testcase, etc.
Andrey Lushnikov
Comment 1 2013-02-01 15:07:15 PST
Created attachment 186154 [details] Patch
Andrey Lushnikov
Comment 2 2013-02-01 15:07:54 PST
Created attachment 186155 [details] Cursor inside OR block
Build Bot
Comment 3 2013-02-01 17:46:39 PST
Comment on attachment 186154 [details] Patch Attachment 186154 [details] did not pass mac-ews (mac): Output: http://queues.webkit.org/results/16330404 New failing tests: inspector/editor/brace-matcher.html
WebKit Review Bot
Comment 4 2013-02-01 18:27:28 PST
Comment on attachment 186154 [details] Patch Attachment 186154 [details] did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16331433 New failing tests: inspector/editor/brace-matcher.html
Build Bot
Comment 5 2013-02-01 20:12:47 PST
Comment on attachment 186154 [details] Patch Attachment 186154 [details] did not pass mac-wk2-ews (mac-wk2): Output: http://queues.webkit.org/results/16336468 New failing tests: inspector/editor/brace-matcher.html
Andrey Lushnikov
Comment 6 2013-02-05 03:40:41 PST
Created attachment 186594 [details] Patch
Andrey Lushnikov
Comment 7 2013-02-06 01:20:50 PST
Created attachment 186783 [details] Patch
Pavel Feldman
Comment 8 2013-02-06 04:09:19 PST
Comment on attachment 186783 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186783&action=review Overall looks good. Please migrate the {} auto-indent code to the new matcher to test if the API is universal enough. > Source/WebCore/inspector/front-end/TextEditorHighlighter.js:199 > + else {} around multiline block please. > Source/WebCore/inspector/front-end/TextEditorModel.js:676 > + if (lineNumber >= this._textModel.linesCount || lineNumber < 0) When does this happen? > Source/WebCore/inspector/front-end/TextEditorModel.js:702 > + findLeftPretendent: function(lineNumber, column, maxBraceIteration) Pretendent -> Candidate > Source/WebCore/inspector/front-end/TextEditorModel.js:796 > + You don't need to make every other line a whitespace.
Andrey Lushnikov
Comment 9 2013-02-06 04:46:59 PST
Comment on attachment 186783 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186783&action=review >> Source/WebCore/inspector/front-end/TextEditorHighlighter.js:199 >> + else > > {} around multiline block please. fixed >> Source/WebCore/inspector/front-end/TextEditorModel.js:676 >> + if (lineNumber >= this._textModel.linesCount || lineNumber < 0) > > When does this happen? in while-loop of findLeftPretendent: .. while ((braces = this._braceRanges(--lineNumber)) && !braces.length) {}; .. and in a symmetrical findRightCandidate: ... while ((braces = this._braceRanges(++lineNumber)) && !braces.length) {}; ... >> Source/WebCore/inspector/front-end/TextEditorModel.js:702 >> + findLeftPretendent: function(lineNumber, column, maxBraceIteration) > > Pretendent -> Candidate fixed >> Source/WebCore/inspector/front-end/TextEditorModel.js:796 >> + > > You don't need to make every other line a whitespace. removed couple of newlines.
Andrey Lushnikov
Comment 10 2013-02-06 04:47:53 PST
Created attachment 186830 [details] Patch
WebKit Review Bot
Comment 11 2013-02-06 06:47:59 PST
Comment on attachment 186830 [details] Patch Rejecting attachment 186830 [details] from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=gce-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 186830, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: 113. 2 out of 2 hunks FAILED -- saving rejects to file LayoutTests/inspector/editor/highlighter-basics-expected.txt.rej patching file LayoutTests/inspector/editor/text-editor-long-line-expected.txt Hunk #1 FAILED at 2. 1 out of 1 hunk FAILED -- saving rejects to file LayoutTests/inspector/editor/text-editor-long-line-expected.txt.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', '--force', '--reviewer', 'Pavel Feldman']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/16389274
Andrey Lushnikov
Comment 12 2013-02-06 07:43:03 PST
Created attachment 186853 [details] Patch
WebKit Review Bot
Comment 13 2013-02-07 03:52:45 PST
Comment on attachment 186853 [details] Patch Clearing flags on attachment: 186853 Committed r142091: <http://trac.webkit.org/changeset/142091>
WebKit Review Bot
Comment 14 2013-02-07 03:52:50 PST
All reviewed patches have been landed. Closing bug.
Note You need to log in before you can comment on or make changes to this bug.