205913 2020-01-08 02:17:04 -0800 [GTK] Editing: Allow line breaks in lists 2020-01-08 07:14:03 -0800 1 1 1 Unclassified WebKit WebKitGTK Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mcrha webkit-unassigned bugs-noreply cgarcia commit-queue qoheniac oldest_to_newest 1604010 0 mcrha 2020-01-08 02:17:04 -0800 Moving this from a downstream report: https://gitlab.gnome.org/GNOME/evolution/issues/747 Ordered and unorder lists can contain ("soft") line breaks, but the WebKitGTK+ editor doesn't allow it. That is, you can have an unordered list like this: * line 1 of item 1 line 2 of item 1 * item 2 Trying with Libre Office, there can be used Shift+Enter to insert the ("soft") line break into the list item. In WebKitGTK+ the Shift+Enter behaves the same as plain Enter key press. This had been tested with WebKitGTK+ webkit2.26 branch at r252187. Steps: a) run MiniBrowser --editor-mode b) right-click in the body and pick "Inspect Element" c) switch to the console tab and execute there: document.execCommand("insertunorderedlist", false, "") d) click into the body (the cursor is after the '*' of the inserted unordered list) e) type: abc f) press Shift+Enter It adds a new list item: * abc * | instead of soft line break within the current list item: * abc | (where the '|' means the caret position). 1604029 1 387092 mcrha 2020-01-08 03:22:41 -0800 Created attachment 387092 proposed patch Here is a proposed patch. It's not only for lists, but I think it's fine. Notes: I wanted to use "prepare-ChangeLog" script, but it failed with the below error. It doesn't know I changed anything, even the 'git status' says: > On branch webkit-2.26 > Changes not staged for commit: > (use "git add <file>..." to update what will be committed) > (use "git checkout -- <file>..." to discard changes in working directory) > > modified: Source/WebKit/UIProcess/gtk/KeyBindingTranslator.cpp > > no changes added to commit (use "git add" and/or "git commit -a") Thus there's something fishy about it, or the script works differently since the last time I used it (which is years ago). As this failed, I didn't go through step 7 of the https://webkit.org/contributing-code/ ; I just made the patch with `git diff`. ----------------------------------------------------------------------------- The error output promised at the top: $ Tools/Scripts/prepare-ChangeLog --style -b https://bugs.webkit.org/show_bug.cgi?id=205913 Running check-webkit-style. Traceback (most recent call last): File "/data/develop/test-wk2/_other/webkit.master/Tools/Scripts/check-webkit-style", line 48, in <module> sys.exit(CheckWebKitStyle().main()) File "/data/develop/test-wk2/_other/webkit.master/Tools/Scripts/webkitpy/style/main.py", line 153, in main patch = host.scm().create_patch(options.git_commit, changed_files=changed_files, git_index=options.git_index) File "/data/develop/test-wk2/_other/webkit.master/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 354, in create_patch command += [self.merge_base(git_commit)] File "/data/develop/test-wk2/_other/webkit.master/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 215, in merge_base return self.remote_merge_base() File "/data/develop/test-wk2/_other/webkit.master/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 528, in remote_merge_base return self._run_git(['merge-base', self.remote_branch_ref(), 'HEAD']).strip() File "/data/develop/test-wk2/_other/webkit.master/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 106, in _run_git return self.run(full_command_args, **full_kwargs) File "/data/develop/test-wk2/_other/webkit.master/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 78, in run decode_output=decode_output) File "/data/develop/test-wk2/_other/webkit.master/Tools/Scripts/webkitpy/common/system/executive.py", line 412, in run_command (error_handler or self.default_error_handler)(script_error) File "/data/develop/test-wk2/_other/webkit.master/Tools/Scripts/webkitpy/common/system/abstractexecutive.py", line 97, in default_error_handler raise error webkitpy.common.system.executive.ScriptError: Failed to run "['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD']" exit_code: 1 cwd: /data/develop/test-wk2/_other/webkit.master Running status to find changed, added, or removed files. No changes found. $ Tools/Scripts/prepare-ChangeLog --nostyle -b https://bugs.webkit.org/show_bug.cgi?id=205913 Running status to find changed, added, or removed files. No changes found. I also tried "git add Source/WebKit/UIProcess/gtk/KeyBindingTranslator.cpp", but the prepare-ChangeLog didn't find the changes anyway. 1604032 2 387092 cgarcia 2020-01-08 03:50:31 -0800 Comment on attachment 387092 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=387092&action=review r- because the changelog is not correct, cq won't allow this in any case. > Source/WebKit/ChangeLog:9 > + Treat Shift+Enter as "InsertLineBreak", instead of "InsertParagraph". I guess you mean instead of "InsertNewLine" > Source/WebKit/ChangeLog:10 > + This ChangeLog is not correctly formatted... we need to figure out why the script doesn't work for you. > Source/WebKit/UIProcess/gtk/KeyBindingTranslator.cpp:217 > // Special-case enter keys for we want them to work regardless of modifier. This comment is no longer accurate. Could we just handle enter keys as all other custom key bindings and add them to the table above and just reove this special case? 1604068 3 mcrha 2020-01-08 06:18:46 -0800 (In reply to Carlos Garcia Campos from comment #2) > I guess you mean instead of "InsertNewLine" Oops, that's right. I wrote it off-head, my fault. > This ChangeLog is not correctly formatted... we need to figure out why the > script doesn't work for you. Right. Any idea how to debug it? I tried to switch from the webkit-2.26 git branch to the master branch and it made the style checked happy, but the prepare-ChangeLog still claims that it didn't find any change. > Could we just handle enter keys as all other custom key bindings and add > them to the table above and just reove this special case? Okay. It uncovered a bug in that code. When I've a NumLock on, then the 'state' variable says 0x10, which doesn't match any of the combined state and keycode values. Thus I fixed that too, by considering only Ctrl+Alt+Shift keys from the 'state'. I reformatted whole "table", because the "InsertLineBreak" is longer than "InsertBacktab", thus it would need longer lines anyway. 1604069 4 387101 mcrha 2020-01-08 06:19:15 -0800 Created attachment 387101 proposed patch ][ 1604073 5 387101 cgarcia 2020-01-08 06:26:50 -0800 Comment on attachment 387101 proposed patch ][ Thanks! 1604082 6 387101 commit-queue 2020-01-08 07:14:01 -0800 Comment on attachment 387101 proposed patch ][ Clearing flags on attachment: 387101 Committed r254199: <https://trac.webkit.org/changeset/254199> 1604083 7 commit-queue 2020-01-08 07:14:03 -0800 All reviewed patches have been landed. Closing bug. 387092 2020-01-08 03:22:41 -0800 2020-01-08 06:19:15 -0800 proposed patch wk.patch text/plain 1586 mcrha ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMWZhMzFjMmU1NzkuLmVkMTJkNDY4MmUxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDIwLTAxLTA4ICBNaWxhbiBDcmhhICA8bWNyaGFAcmVkaGF0LmNvbT4KKworICAg ICAgICBbR1RLXSBFZGl0aW5nOiBBbGxvdyBsaW5lIGJyZWFrcyBpbiBsaXN0cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1OTEzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgISEhTk9CT0RZISEhLgorCisgICAgICAgICogVUlQcm9jZXNzL2d0ay9LZXlC aW5kaW5nVHJhbnNsYXRvci5jcHA6CisJVHJlYXQgU2hpZnQrRW50ZXIgYXMgIkluc2VydExpbmVC cmVhayIsIGluc3RlYWQgb2YgIkluc2VydFBhcmFncmFwaCIuCisKIDIwMTktMTEtMDcgIEFkcmlh biBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLiBVcGRhdGUgT3B0aW9uc1dQRS5jbWFrZSBhbmQgTkVXUyBmb3IgdGhlIDIuMjYuMiByZWxl YXNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvS2V5QmluZGluZ1Ry YW5zbGF0b3IuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0tleUJpbmRpbmdUcmFu c2xhdG9yLmNwcAppbmRleCA1NzNiYWZkNDg1MS4uNjhiYTA0NTcyNDUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9LZXlCaW5kaW5nVHJhbnNsYXRvci5jcHAKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0tleUJpbmRpbmdUcmFuc2xhdG9yLmNwcApAQCAt MjE1LDggKzIxNSwxMiBAQCBWZWN0b3I8U3RyaW5nPiBLZXlCaW5kaW5nVHJhbnNsYXRvcjo6Y29t bWFuZHNGb3JLZXlFdmVudChHZGtFdmVudEtleSogZXZlbnQpCiAgICAgICAgIHJldHVybiBXVEZN b3ZlKG1fcGVuZGluZ0VkaXRvckNvbW1hbmRzKTsKIAogICAgIC8vIFNwZWNpYWwtY2FzZSBlbnRl ciBrZXlzIGZvciB3ZSB3YW50IHRoZW0gdG8gd29yayByZWdhcmRsZXNzIG9mIG1vZGlmaWVyLgot ICAgIGlmICgoa2V5dmFsID09IEdES19LRVlfUmV0dXJuIHx8IGtleXZhbCA9PSBHREtfS0VZX0tQ X0VudGVyIHx8IGtleXZhbCA9PSBHREtfS0VZX0lTT19FbnRlcikpCisgICAgaWYgKChrZXl2YWwg PT0gR0RLX0tFWV9SZXR1cm4gfHwga2V5dmFsID09IEdES19LRVlfS1BfRW50ZXIgfHwga2V5dmFs ID09IEdES19LRVlfSVNPX0VudGVyKSkgeworICAgICAgICBpZiAoKHN0YXRlICYgR0RLX1NISUZU X01BU0spKQorICAgICAgICAgICAgcmV0dXJuIHsgIkluc2VydExpbmVCcmVhayIgfTsKKwogICAg ICAgICByZXR1cm4geyAiSW5zZXJ0TmV3TGluZSIgfTsKKyAgICB9CiAKICAgICAvLyBGb3Iga2V5 cHJlc3MgZXZlbnRzLCB3ZSB3YW50IGNoYXJDb2RlKCksIGJ1dCBrZXlDb2RlKCkgZG9lcyB0aGF0 LgogICAgIHVuc2lnbmVkIG1hcEtleSA9IHN0YXRlIDw8IDE2IHwga2V5dmFsOwo= 387101 2020-01-08 06:19:15 -0800 2020-01-08 07:14:01 -0800 proposed patch ][ wk.patch text/plain 2998 mcrha ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZDc3NjhhYWFmZjAuLjc3NjFjNTgwNDQ1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDIwLTAxLTA4ICBNaWxhbiBDcmhhICA8bWNyaGFAcmVkaGF0LmNvbT4KKworICAg ICAgICBbR1RLXSBFZGl0aW5nOiBBbGxvdyBsaW5lIGJyZWFrcyBpbiBsaXN0cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1OTEzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL0tl eUJpbmRpbmdUcmFuc2xhdG9yLmNwcDoKKyAgICAgICAgVHJlYXQgU2hpZnQrRW50ZXIgYXMgIklu c2VydExpbmVCcmVhayIsIGluc3RlYWQgb2YgIkluc2VydE5ld0xpbmUiLgorCiAyMDIwLTAxLTA4 ICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQg TWVkaWFSZWNvcmRlciBiYWNrZW5kIGluIEdQVVByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2d0ay9LZXlCaW5kaW5nVHJhbnNsYXRvci5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9ndGsvS2V5QmluZGluZ1RyYW5zbGF0b3IuY3BwCmluZGV4IDU3M2JhZmQ0 ODUxLi4zYTllZThjNzE2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3Rr L0tleUJpbmRpbmdUcmFuc2xhdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9n dGsvS2V5QmluZGluZ1RyYW5zbGF0b3IuY3BwCkBAIC0xOTMsMTIgKzE5MywxOCBAQCBzdHJ1Y3Qg S2V5Q29tYmluYXRpb25FbnRyeSB7CiB9OwogCiBzdGF0aWMgY29uc3QgS2V5Q29tYmluYXRpb25F bnRyeSBjdXN0b21LZXlCaW5kaW5nc1tdID0gewotICAgIHsgR0RLX0tFWV9iLCAgICAgICAgIEdE S19DT05UUk9MX01BU0ssICAgICAgICAgICAgICAgIlRvZ2dsZUJvbGQiICAgIH0sCi0gICAgeyBH REtfS0VZX2ksICAgICAgICAgR0RLX0NPTlRST0xfTUFTSywgICAgICAgICAgICAgICAiVG9nZ2xl SXRhbGljIiAgfSwKLSAgICB7IEdES19LRVlfRXNjYXBlLCAgICAwLCAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJDYW5jZWwiICAgICAgICB9LAotICAgIHsgR0RLX0tFWV9ncmVhdGVyLCAg IEdES19DT05UUk9MX01BU0ssICAgICAgICAgICAgICAgIkNhbmNlbCIgICAgICAgIH0sCi0gICAg eyBHREtfS0VZX1RhYiwgICAgICAgMCwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiSW5z ZXJ0VGFiIiAgICAgfSwKLSAgICB7IEdES19LRVlfVGFiLCAgICAgICBHREtfU0hJRlRfTUFTSywg ICAgICAgICAgICAgICAgICJJbnNlcnRCYWNrdGFiIiB9LAorICAgIHsgR0RLX0tFWV9iLCAgICAg ICAgIEdES19DT05UUk9MX01BU0ssICJUb2dnbGVCb2xkIiAgICAgIH0sCisgICAgeyBHREtfS0VZ X2ksICAgICAgICAgR0RLX0NPTlRST0xfTUFTSywgIlRvZ2dsZUl0YWxpYyIgICAgfSwKKyAgICB7 IEdES19LRVlfRXNjYXBlLCAgICAwLCAgICAgICAgICAgICAgICAiQ2FuY2VsIiAgICAgICAgICB9 LAorICAgIHsgR0RLX0tFWV9ncmVhdGVyLCAgIEdES19DT05UUk9MX01BU0ssICJDYW5jZWwiICAg ICAgICAgIH0sCisgICAgeyBHREtfS0VZX1RhYiwgICAgICAgMCwgICAgICAgICAgICAgICAgIklu c2VydFRhYiIgICAgICAgfSwKKyAgICB7IEdES19LRVlfVGFiLCAgICAgICBHREtfU0hJRlRfTUFT SywgICAiSW5zZXJ0QmFja3RhYiIgICB9LAorICAgIHsgR0RLX0tFWV9SZXR1cm4sICAgIDAsICAg ICAgICAgICAgICAgICJJbnNlcnROZXdMaW5lIiAgIH0sCisgICAgeyBHREtfS0VZX0tQX0VudGVy LCAgMCwgICAgICAgICAgICAgICAgIkluc2VydE5ld0xpbmUiICAgfSwKKyAgICB7IEdES19LRVlf SVNPX0VudGVyLCAwLCAgICAgICAgICAgICAgICAiSW5zZXJ0TmV3TGluZSIgICB9LAorICAgIHsg R0RLX0tFWV9SZXR1cm4sICAgIEdES19TSElGVF9NQVNLLCAgICJJbnNlcnRMaW5lQnJlYWsiIH0s CisgICAgeyBHREtfS0VZX0tQX0VudGVyLCAgR0RLX1NISUZUX01BU0ssICAgIkluc2VydExpbmVC cmVhayIgfSwKKyAgICB7IEdES19LRVlfSVNPX0VudGVyLCBHREtfU0hJRlRfTUFTSywgICAiSW5z ZXJ0TGluZUJyZWFrIiB9LAogfTsKIAogVmVjdG9yPFN0cmluZz4gS2V5QmluZGluZ1RyYW5zbGF0 b3I6OmNvbW1hbmRzRm9yS2V5RXZlbnQoR2RrRXZlbnRLZXkqIGV2ZW50KQpAQCAtMjE0LDEyICsy MjAsOCBAQCBWZWN0b3I8U3RyaW5nPiBLZXlCaW5kaW5nVHJhbnNsYXRvcjo6Y29tbWFuZHNGb3JL ZXlFdmVudChHZGtFdmVudEtleSogZXZlbnQpCiAgICAgaWYgKCFtX3BlbmRpbmdFZGl0b3JDb21t YW5kcy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBXVEZNb3ZlKG1fcGVuZGluZ0VkaXRvckNv bW1hbmRzKTsKIAotICAgIC8vIFNwZWNpYWwtY2FzZSBlbnRlciBrZXlzIGZvciB3ZSB3YW50IHRo ZW0gdG8gd29yayByZWdhcmRsZXNzIG9mIG1vZGlmaWVyLgotICAgIGlmICgoa2V5dmFsID09IEdE S19LRVlfUmV0dXJuIHx8IGtleXZhbCA9PSBHREtfS0VZX0tQX0VudGVyIHx8IGtleXZhbCA9PSBH REtfS0VZX0lTT19FbnRlcikpCi0gICAgICAgIHJldHVybiB7ICJJbnNlcnROZXdMaW5lIiB9Owot CiAgICAgLy8gRm9yIGtleXByZXNzIGV2ZW50cywgd2Ugd2FudCBjaGFyQ29kZSgpLCBidXQga2V5 Q29kZSgpIGRvZXMgdGhhdC4KLSAgICB1bnNpZ25lZCBtYXBLZXkgPSBzdGF0ZSA8PCAxNiB8IGtl eXZhbDsKKyAgICB1bnNpZ25lZCBtYXBLZXkgPSAoc3RhdGUgJiAoR0RLX1NISUZUX01BU0sgfCBH REtfQ09OVFJPTF9NQVNLIHwgR0RLX01PRDFfTUFTSykpIDw8IDE2IHwga2V5dmFsOwogICAgIGlm ICghbWFwS2V5KQogICAgICAgICByZXR1cm4geyB9OwogCg==