mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

[285170] Support for commands that are not properly getting a secondary prompt from the backend.

Browse source
This commit is contained in:
Marc Khouzam 2009-07-30 15:25:21 +00:00
parent 8f13804b5d
commit e64e0c5f19
2 changed files with 57 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBBackendCLIProcess.java
View file

@ -57,4 +57,16 @@ public class GDBBackendCLIProcess extends MIBackendCLIProcess {
// Session disposed.
}
}
/**
* @since 2.1
*/
@Override
protected boolean isMissingSecondaryPromptCommand(String operation) {
// The 'actions' command does not get a secondary prompt!
if (operation.startsWith("ac") && "actions".indexOf(operation) != -1) { //$NON-NLS-1$ //$NON-NLS-2$
return true;
}
return false;
}
}

45
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java
View file

@ -214,6 +214,10 @@ public abstract class AbstractCLIProcess extends Process
}
public void commandSent(ICommandToken token) {
// Bug 285170
// Don't reset the fPrompt here, in case we are
// dealing with the missing secondary prompt.
ICommand<?> command = token.getCommand();
// Check if the command is a CLI command and if it did not originate from this class.
if (command instanceof CLICommand<?> &&
@ -221,8 +225,49 @@ public abstract class AbstractCLIProcess extends Process
{
fSuppressConsoleOutputCounter++;
}
// Bug 285170
// Deal with missing secondary prompt, if needed.
checkMissingSecondaryPrompt(command);
}
private void checkMissingSecondaryPrompt(ICommand<?> command) {
// If the command send is one of ours, check if it is one that is missing a secondary prompt
if (command instanceof ProcessMIInterpreterExecConsole) {
String[] operations = ((ProcessMIInterpreterExecConsole)command).getParameters();
if (operations != null && operations.length > 0) {
// Get the command name.
String operation = operations[0];
int indx = operation.indexOf(' ');
if (indx != -1) {
operation = operation.substring(0, indx).trim();
} else {
operation = operation.trim();
}
if (isMissingSecondaryPromptCommand(operation)) {
// For such commands, the backend does not send the secondary prompt
// so we set it manually. We'll remain in this state until we get
// a commandDone() call.
// This logic will still work when a new version of the backend
// fixes this lack of secondary prompt.
fPrompt = 2;
}
}
}
}
/**
* Check to see if the user typed a command that we know the backend
* does not send the secondary prompt for, but should.
* If so, we'll need to pretend we are receiving the secondary prompt.
*
* @since 2.1
*/
protected boolean isMissingSecondaryPromptCommand(String operation) {
return false;
}
public void commandRemoved(ICommandToken token) {
// Ignore
}