DevTools: roll CodeMirror

third_party/WebKit/LayoutTests/inspector/editor/editor-test.js

 function initialize_EditorTests()
 {
 
 InspectorTest.createTestEditor = function(clientHeight, textEditorDelegate)
 {
     var textEditor = new WebInspector.CodeMirrorTextEditor("", textEditorDelegate || new WebInspector.TextEditorDelegate());
     clientHeight = clientHeight || 100;
     textEditor.element.style.height = clientHeight + "px";
     textEditor.element.style.flex = "none";
     textEditor.show(WebInspector.inspectorView.element);
@@ skipping 39 matching lines @@
         var selection = selections[i];
         if (typeof selection.column === "number") {
             selection.from = selection.column;
             selection.to = selection.column;
         }
         coords.push(new WebInspector.TextRange(selection.line, selection.from, selection.line, selection.to));
     }
     editor.setSelections(coords);
 }
 
-InspectorTest.typeIn = function(editor, typeText, callback)
+InspectorTest.typeIn = function(editor, typeText, finalCallback)
 {
-    callback = callback || new Function();
+    finalCallback = finalCallback || new Function();
+    var charIndex = 0;
     var noop = new Function();
-    for(var charIndex = 0; charIndex < typeText.length; ++charIndex) {
-        // As soon as the last key event was processed, the whole text was processed.
-        var iterationCallback = charIndex + 1 === typeText.length ? callback : noop;
-        switch (typeText[charIndex]) {
+    iterationCallback();
+
+    function iterationCallback()
+    {
+        var character = typeText[charIndex];

[lushnikov, 2016/07/20 01:40:13]

typeText[charIndex++]

[einbinder, 2016/07/21 20:35:50]

Done.

+        var command;
+        var callback = noop;
+        switch (character) {
         case "\n":
-            InspectorTest.fakeKeyEvent(editor, "Enter", null, iterationCallback);
+            command = "Enter";
+            callback = iterationCallback;

[lushnikov, 2016/07/20 01:40:13]

should we do this?

[einbinder, 2016/07/21 20:35:50]

nope

             break;
         case "L":
-            InspectorTest.fakeKeyEvent(editor, "ArrowLeft", null, iterationCallback);
+            command = "ArrowLeft";
             break;
         case "R":
-            InspectorTest.fakeKeyEvent(editor, "ArrowRight", null, iterationCallback);
+            command = "ArrowRight";
             break;
         case "U":
-            InspectorTest.fakeKeyEvent(editor, "ArrowUp", null, iterationCallback);
+            command = "ArrowUp";
             break;
         case "D":
-            InspectorTest.fakeKeyEvent(editor, "ArrowDown", null, iterationCallback);
+            command = "ArrowDown";
             break;
         default:
-            InspectorTest.fakeKeyEvent(editor, typeText[charIndex], null, iterationCallback);
+            command = character;
+        }
+        charIndex++;
+        if (typeText.length === charIndex)
+            callback = finalCallback;
+        else if (typeText[charIndex] === "\n")
+            callback = iterationCallback;
+        InspectorTest.fakeKeyEvent(editor, command, null, callback);
+        if (callback === noop) {

[lushnikov, 2016/07/20 01:40:13]

nit: braces

[einbinder, 2016/07/21 20:35:50]

Done.

+            iterationCallback();
         }
     }
 }
 
 var eventCodes = {
     Enter: 13,
     Home: 36,
     ArrowLeft: 37,
     ArrowUp: 38,
     ArrowRight: 39,
     ArrowDown: 40
 };
 
-function createCodeMirrorFakeEvent(eventType, code, charCode, modifiers)
+function createCodeMirrorFakeEvent(editor, eventType, code, charCode, modifiers)
 {
     function eventPreventDefault()
     {
         this._handled = true;
     }
     var event = {
         _handled: false,
         type: eventType,
         keyCode: code,
         charCode: charCode,
         preventDefault: eventPreventDefault,
         stopPropagation: function(){},
+        target: editor._codeMirror.display.input.textarea
     };
     if (modifiers) {
         for (var i = 0; i < modifiers.length; ++i)
             event[modifiers[i]] = true;
     }
     return event;
 }
 
 function fakeCodeMirrorKeyEvent(editor, eventType, code, charCode, modifiers)
 {
-    var event = createCodeMirrorFakeEvent(eventType, code, charCode, modifiers);
+    var event = createCodeMirrorFakeEvent(editor, eventType, code, charCode, modifiers);
     switch(eventType) {
     case "keydown":
         editor._codeMirror.triggerOnKeyDown(event);
         break;
     case "keypress":
         editor._codeMirror.triggerOnKeyPress(event);
         break;
     case "keyup":
         editor._codeMirror.triggerOnKeyUp(event);
         break;
     default:
         throw new Error("Unknown KeyEvent type");
     }
     return event._handled;
 }
 
 function fakeCodeMirrorInputEvent(editor, character)
 {
     if (typeof character === "string")
-        editor._codeMirror.display.input.value += character;
+        editor._codeMirror.display.input.textarea.value += character;
 }
 
 InspectorTest.fakeKeyEvent = function(editor, originalCode, modifiers, callback)
 {
     modifiers = modifiers || [];
     var code;
     var charCode;
     if (originalCode === "'") {
         code = 222;
         charCode = 0;
@@ skipping 47 matching lines @@
         var keyName = sortedKeys[i];
         if (!keyName.length)
             keyName = "<Empty string>";
         else
             keyName = "'" + keyName + "'";
         InspectorTest.addResult(keyName + ": " + listHashMap[sortedKeys[i]]);
     }
 }
 
 }