Experimental solution for step through interpreting the full flow issue #16351

src/Keymapping-Core/KMDispatchChain.class.st

@@ -26,8 +26,16 @@ KMDispatchChain class >> from: anInitialTarget andDispatcher: aDispatcher [
 { #category : 'dispatching' }
 KMDispatchChain >> dispatch: aKeyboardEvent [
 	self do: [ :targetToDispatch |
-		targetToDispatch dispatch: KMBuffer uniqueInstance buffer copy.
+		| sequence |
+		sequence := KMBuffer uniqueInstance buffer copy.
+		targetToDispatch dispatch: sequence.
 		aKeyboardEvent wasHandled ifTrue: [ ^self ].
+		"Let's try to match this sequence of events again.
+		This time ignoring any repeated events."
+		sequence removeAllSuchThat: [ :ev | ev isRepeat ].
+		sequence isNotEmpty ifTrue: [
+			targetToDispatch dispatch: sequence.
+			aKeyboardEvent wasHandled ifTrue: [ ^self ] ]
 	].
 	"This should be a noMatch event"
 	aKeyboardEvent wasHandled ifFalse: [ KMBuffer uniqueInstance clearBuffer ]

src/Keymapping-Tests/KMDispatcherTest.class.st

@@ -126,3 +126,43 @@ KMDispatcherTest >> testNoStaggeredTrigger [
 	self deny: flag1.
 	self assert: flag2
 ]
+
+{ #category : 'tests' }
+KMDispatcherTest >> testRepeatEvents [
+	| morph flag category pressA repeatPressA pressB repeatPressB pressC |
+	category := KMCategory named: #TestBlah.
+	KMRepository default addCategory: category.
+
+	morph := BorderedMorph new.
+	morph kmDispatcher reset.
+	flag := false.
+
+	category addKeymapEntry: (KMKeymap named: #Foo shortcut: $a asKeyCombination, $b asKeyCombination, $c asKeyCombination action: [flag := true]).
+	morph attachKeymapCategory: #TestBlah.
+
+	pressA := self eventKey: $a.
+	morph kmDispatcher dispatchKeystroke: pressA.
+	self assert: morph kmDispatcher buffer asArray equals: {pressA}.
+
+	repeatPressA := (self eventKey: $a) isRepeat: true; yourself.
+	morph kmDispatcher dispatchKeystroke: repeatPressA.
+	self assert: morph kmDispatcher buffer asArray equals: {pressA. repeatPressA}.
+	self assert: (morph kmDispatcher buffer asArray collect: [ :v | v isRepeat ]) equals: {false. true}.
+
+	pressB := self eventKey: $b.
+	morph kmDispatcher dispatchKeystroke: pressB.
+	self assert: morph kmDispatcher buffer asArray equals: {pressA. repeatPressA. pressB}.
+	self assert: (morph kmDispatcher buffer asArray collect: [ :v | v isRepeat ]) equals: {false. true. false}.
+
+	repeatPressB := (self eventKey: $b) isRepeat: true; yourself.
+	morph kmDispatcher dispatchKeystroke: repeatPressB.
+	self assert: morph kmDispatcher buffer asArray equals: {pressA. repeatPressA. pressB. repeatPressB}.
+	self assert: (morph kmDispatcher buffer asArray collect: [ :v | v isRepeat ]) equals: {false. true. false. true}.
+
+	pressC := self eventKey: $c.
+	morph kmDispatcher
+		dispatchKeystroke: pressC.
+	self assert: morph kmDispatcher buffer isEmpty.
+
+	self assert: flag
+]

src/Morphic-Core/KeyboardEvent.class.st

@@ -9,7 +9,8 @@ Class {
 		'charCode',
 		'scanCode',
 		'key',
-		'supressNextKeyPress'
+		'supressNextKeyPress',
+		'isRepeat'
 	],
 	#category : 'Morphic-Core-Events',
 	#package : 'Morphic-Core',
@@ -53,7 +54,8 @@ KeyboardEvent >> hash [
 KeyboardEvent >> initialize [
 
 	super initialize.
-	supressNextKeyPress := false
+	supressNextKeyPress := false.
+	isRepeat := false
 ]
 
 { #category : 'testing' }
@@ -81,6 +83,18 @@ KeyboardEvent >> isMouseMove [
 	^false
 ]
 
+{ #category : 'accessing' }
+KeyboardEvent >> isRepeat [
+
+	^ isRepeat
+]
+
+{ #category : 'accessing' }
+KeyboardEvent >> isRepeat: aBoolean [
+
+	isRepeat := aBoolean
+]
+
 { #category : 'keyboard' }
 KeyboardEvent >> key [
 	^ key ifNil: [key := Smalltalk os keyForValue: keyValue]

src/OSWindow-Core/OSWindowMorphicEventHandler.class.st

@@ -220,7 +220,8 @@ OSWindowMorphicEventHandler >> visitKeyDownEvent: anEvent [
 		stamp: Time millisecondClockValue.
 	keyEvent
 		scanCode: anEvent scanCode;
-		key: (OSKeySymbols mapKeySymbolValueToKeyboardKey: anEvent symbol).
+		key: (OSKeySymbols mapKeySymbolValueToKeyboardKey: anEvent symbol);
+		isRepeat: anEvent repeat = 1.
 	self dispatchMorphicEvent: keyEvent
 ]
 
@@ -237,7 +238,8 @@ OSWindowMorphicEventHandler >> visitKeyUpEvent: anEvent [
 		stamp: Time millisecondClockValue.
 	keyEvent
 		scanCode: anEvent scanCode;
-		key: (OSKeySymbols mapKeySymbolValueToKeyboardKey: anEvent symbol).
+		key: (OSKeySymbols mapKeySymbolValueToKeyboardKey: anEvent symbol);
+		isRepeat: anEvent repeat = 1.
 	^ keyEvent
 ]