mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-30 04:15:35 +02:00
Code Issues Wiki Activity

RESOLVED - bug 211659: Add FieldAssist to the terminal input field

Browse source 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=211659
(coments added)
This commit is contained in:
Michael Scharf 2008-01-22 22:40:51 +00:00
parent e621ad0716
commit 236027f61c
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007 Wind River Systems, Inc. and others. * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,10 +7,10 @@
* *
* Contributors: * Contributors:
* Michael Scharf (Wind River) - initial implementation * Michael Scharf (Wind River) - initial implementation
* Michael Scharf (Wing River) - fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=211659
*******************************************************************************/ *******************************************************************************/
package org.eclipse.tm.internal.terminal.control; package org.eclipse.tm.internal.terminal.control;
import java.util.ArrayList;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter; import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
/** /**
* Manages the Command History for the command line input * Manages the Command History for the command line input
* of the terminal control. * of the terminal control.
@ -211,7 +212,10 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
} }
fInputField.setLayoutData(data); fInputField.setLayoutData(data);
fInputField.setFont(terminal.getFont()); fInputField.setFont(terminal.getFont());
// register the field assist // Register field assist *before* the key listener.
// Else the ENTER key is sent *first* to the input field
// and then to the field assist popup.
// (https://bugs.eclipse.org/bugs/show_bug.cgi?id=211659)
new ContentAssistCommandAdapter( new ContentAssistCommandAdapter(
fInputField, fInputField,
new TextContentAdapter(), new TextContentAdapter(),
@ -221,6 +225,8 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
installDecoration); installDecoration);
fInputField.addKeyListener(new KeyListener(){ fInputField.addKeyListener(new KeyListener(){
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
// if the field assist has handled the key already then
// ignore it (https://bugs.eclipse.org/bugs/show_bug.cgi?id=211659)
if(!e.doit) if(!e.doit)
return; return;
if(e.keyCode=='\n' || e.keyCode=='\r') { if(e.keyCode=='\n' || e.keyCode=='\r') {