<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192804] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192804">192804</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2015-11-30 10:26:56 -0800 (Mon, 30 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: delete-by-word and similar shortcuts should add text to the WebCore kill ring
https://bugs.webkit.org/show_bug.cgi?id=151312
Reviewed by Darin Adler.
Add support for other kill ring-eligible keybindinsg, such as
deleting by word, group, or line forwards and backwards.
* UserInterface/Controllers/CodeMirrorTextKillController.js:
(WebInspector.CodeMirrorTextKillController):
(WebInspector.CodeMirrorTextKillController.prototype._handleTextKillCommand): Renamed from _handleKillLine.
Parameterize the function so it can handle any keybinding and
command. Take a kill ring insertion mode argument, too.
(WebInspector.CodeMirrorTextKillController.prototype._handleTextChange):
Add some special casing for changes received from Delete Line
(Cmd-D) so the right text is added to the kill ring. Thread the
kill ring insertion mode to the frontend host call.
(WebInspector.CodeMirrorTextKillController.prototype._handleKillLine): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorTextKillControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTextKillController.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (192803 => 192804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-11-30 18:24:25 UTC (rev 192803)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-11-30 18:26:56 UTC (rev 192804)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-11-30 Brian Burg <bburg@apple.com>
+
+ Web Inspector: delete-by-word and similar shortcuts should add text to the WebCore kill ring
+ https://bugs.webkit.org/show_bug.cgi?id=151312
+
+ Reviewed by Darin Adler.
+
+ Add support for other kill ring-eligible keybindinsg, such as
+ deleting by word, group, or line forwards and backwards.
+
+ * UserInterface/Controllers/CodeMirrorTextKillController.js:
+ (WebInspector.CodeMirrorTextKillController):
+ (WebInspector.CodeMirrorTextKillController.prototype._handleTextKillCommand): Renamed from _handleKillLine.
+
+ Parameterize the function so it can handle any keybinding and
+ command. Take a kill ring insertion mode argument, too.
+
+ (WebInspector.CodeMirrorTextKillController.prototype._handleTextChange):
+
+ Add some special casing for changes received from Delete Line
+ (Cmd-D) so the right text is added to the kill ring. Thread the
+ kill ring insertion mode to the frontend host call.
+
+ (WebInspector.CodeMirrorTextKillController.prototype._handleKillLine): Deleted.
+
</ins><span class="cx"> 2015-11-29 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add context menu item to Reload the Inspector
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorTextKillControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTextKillController.js (192803 => 192804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTextKillController.js 2015-11-30 18:24:25 UTC (rev 192803)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTextKillController.js 2015-11-30 18:26:56 UTC (rev 192804)
</span><span class="lines">@@ -34,30 +34,44 @@
</span><span class="cx"> this._codeMirror = codeMirror;
</span><span class="cx"> this._expectingChangeEventForKill = false;
</span><span class="cx"> this._nextKillStartsNewSequence = true;
</span><ins>+ this._shouldPrependToKillRing = false;
</ins><span class="cx">
</span><span class="cx"> this._handleTextChangeListener = this._handleTextChange.bind(this);
</span><span class="cx"> this._handleEditorBlurListener = this._handleEditorBlur.bind(this);
</span><span class="cx"> this._handleSelectionOrCaretChangeListener = this._handleSelectionOrCaretChange.bind(this);
</span><span class="cx">
</span><ins>+ // FIXME: these keybindings match CodeMirror's default keymap for OS X.
+ // They should probably be altered for Windows / Linux someday.
</ins><span class="cx"> this._codeMirror.addKeyMap({
</span><del>- "Ctrl-K": this._handleKillLine.bind(this),
</del><ins>+ // Overrides for the 'emacsy' keymap.
+ "Ctrl-K": this._handleTextKillCommand.bind(this, "killLine", false),
+ "Alt-D": this._handleTextKillCommand.bind(this, "delWordAfter", false),
+ "Cmd-D": this._handleTextKillCommand.bind(this, "deleteLine", false),
+ // Overrides for the 'macDefault' keymap.
+ "Alt-Delete": this._handleTextKillCommand.bind(this, "delGroupAfter", false),
+ "Cmd-Backspace": this._handleTextKillCommand.bind(this, "delWrappedLineLeft", true),
+ "Cmd-Delete": this._handleTextKillCommand.bind(this, "delWrappedLineRight", false),
+ "Alt-Backspace": this._handleTextKillCommand.bind(this, "delGroupBefore", true),
+ "Ctrl-Alt-Backspace": this._handleTextKillCommand.bind(this, "delGroupAfter", false),
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _handleKillLine(codeMirror)
</del><ins>+ _handleTextKillCommand(command, prependsToKillRing, codeMirror)
</ins><span class="cx"> {
</span><span class="cx"> // Read-only mode is dynamic in some editors, so check every time
</span><span class="cx"> // and ignore the shortcut if in read-only mode.
</span><span class="cx"> if (this._codeMirror.getOption("readOnly"))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ this._shouldPrependToKillRing = prependsToKillRing;
+
</ins><span class="cx"> // Don't add the listener if it's still registered because
</span><span class="cx"> // a previous empty kill didn't generate change events.
</span><span class="cx"> if (!this._expectingChangeEventForKill)
</span><del>- codeMirror.on("changes", this._handleTextChangeListener);
</del><ins>+ this._codeMirror.on("changes", this._handleTextChangeListener);
</ins><span class="cx">
</span><span class="cx"> this._expectingChangeEventForKill = true;
</span><del>- codeMirror.execCommand("killLine");
</del><ins>+ this._codeMirror.execCommand(command);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _handleTextChange(codeMirror, changes)
</span><span class="lines">@@ -81,18 +95,22 @@
</span><span class="cx"> if (change.origin !== "+delete")
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Killing a newline by itself is reported as deletion of two
- // empty strings, so check the change's ranges to detect this.
</del><ins>+ // When killed text includes a newline, CodeMirror returns
+ // strange change objects. Special-case for when this could happen.
</ins><span class="cx"> let killedText;
</span><del>- if (change.to.line === change.from.line + 1)
- killedText = "\n";
- else {
</del><ins>+ if (change.to.line === change.from.line + 1 && change.removed.length === 2) {
+ // An entire line was deleted, including newline (Cmd-D).
+ if (change.removed[0].length && !change.removed[1].length)
+ killedText = change.removed[0] + "\n";
+ // A newline was killed by itself (Ctrl-K).
+ else
+ killedText = "\n";
+ } else {
</ins><span class="cx"> console.assert(change.removed.length === 1);
</span><span class="cx"> killedText = change.removed[0];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const shouldPrependToKillRing = false;
- InspectorFrontendHost.killText(killedText, shouldPrependToKillRing, this._nextKillStartsNewSequence);
</del><ins>+ InspectorFrontendHost.killText(killedText, this._shouldPrependToKillRing, this._nextKillStartsNewSequence);
</ins><span class="cx">
</span><span class="cx"> // If the editor loses focus or the caret / selection changes
</span><span class="cx"> // (not as a result of the kill), then the next kill should
</span></span></pre>
</div>
</div>
</body>
</html>