Browse Source

Revert docking library change (broke more stuff than it fixed). Small improvements to Boo interpreter pad.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4793 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 16 years ago
parent
commit
4ea09fbbae
  1. 10
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/InteractiveInterpreter.cs
  2. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs
  3. 3
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ConsolePad.cs
  4. 5
      src/Libraries/AvalonDock/DockingManager.cs
  5. 32
      src/Main/Base/Project/Src/Gui/Pads/AbstractConsolePad.cs

10
src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/InteractiveInterpreter.cs

@ -36,14 +36,16 @@ namespace Grunwald.BooBinding @@ -36,14 +36,16 @@ namespace Grunwald.BooBinding
SetHighlighting("Boo");
}
protected override void AcceptCommand(string command)
protected override bool AcceptCommand(string command)
{
if (command.EndsWith("\n")) {
ProcessCommand(command);
return true;
} else if (!command.Contains("\n") && !command.EndsWith(":")) {
ProcessCommand(command);
return true;
} else {
TextEditor.Caret.Position = TextEditor.Document.OffsetToPosition(TextEditor.Document.TextLength);
return false;
}
}
@ -81,8 +83,6 @@ namespace Grunwald.BooBinding @@ -81,8 +83,6 @@ namespace Grunwald.BooBinding
PrintLine(ex.InnerException);
}
processing = false;
Append(Environment.NewLine);
}
void PrintLine(object text)
@ -93,7 +93,7 @@ namespace Grunwald.BooBinding @@ -93,7 +93,7 @@ namespace Grunwald.BooBinding
WorkbenchSingleton.SafeThreadAsyncCall(PrintLine, text);
} else {
if (processing)
Append(text.ToString());
AppendLine(text.ToString());
else
InsertLineBeforePrompt(text.ToString());
}

2
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs

@ -394,7 +394,7 @@ namespace ICSharpCode.XmlEditor @@ -394,7 +394,7 @@ namespace ICSharpCode.XmlEditor
{
XmlTextWriter writer = new XmlTextWriter(textWriter);
if (editor.Options.ConvertTabsToSpaces) {
writer.Indentation = editor.Options.IndendationSize;
writer.Indentation = editor.Options.IndentationSize;
writer.IndentChar = ' ';
} else {
writer.Indentation = 1;

3
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ConsolePad.cs

@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
{
public class ConsolePad : AbstractConsolePad
{
protected override void AcceptCommand(string command)
protected override bool AcceptCommand(string command)
{
if (!string.IsNullOrEmpty(command)) {
string result = Evaluate(command);
@ -26,6 +26,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -26,6 +26,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
Append(result + Environment.NewLine);
}
}
return true;
}
string Evaluate(string code)

5
src/Libraries/AvalonDock/DockingManager.cs

@ -2926,10 +2926,7 @@ namespace AvalonDock @@ -2926,10 +2926,7 @@ namespace AvalonDock
DockableContent[] actualContents = DockableContents;
//show all hidden contents
// I don't think we need this in SharpDevelop.
// It causes a problem that hidden pads lose their stored size information
// due to the show/hide happening inside RestoreLayout.
//ShowAllHiddenContents();
ShowAllHiddenContents();
//restore main panel
XmlElement rootElement = doc.DocumentElement.ChildNodes[0] as XmlElement;

32
src/Main/Base/Project/Src/Gui/Pads/AbstractConsolePad.cs

@ -117,9 +117,8 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -117,9 +117,8 @@ namespace ICSharpCode.SharpDevelop.Gui
switch (key) {
case Key.Back:
case Key.Delete:
if (console.editor.SelectionStart == 0 &&
if (console.editor.SelectionStart == 0 &&
console.editor.SelectionLength == console.editor.Document.TextLength) {
cleared = true;
ClearConsole();
return true;
}
@ -145,20 +144,20 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -145,20 +144,20 @@ namespace ICSharpCode.SharpDevelop.Gui
return false;
string commandText = console.CommandText;
this.console.TextEditor.Document.Insert(this.console.TextEditor.Document.TextLength, "\n");
if (!string.IsNullOrEmpty(commandText))
AcceptCommand(commandText);
if (!cleared)
AppendPrompt();
else
console.CommandText = "";
cleared = false;
this.history.Add(commandText);
this.historyPointer = this.history.Count;
if (AcceptCommand(commandText)) {
if (!cleared)
AppendPrompt();
else
console.CommandText = "";
cleared = false;
this.history.Add(commandText);
this.historyPointer = this.history.Count;
}
console.editor.ScrollToEnd();
return true;
default:
return false;
}
return false;
}
/// <summary>
@ -194,7 +193,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -194,7 +193,7 @@ namespace ICSharpCode.SharpDevelop.Gui
get;
}
protected abstract void AcceptCommand(string command);
protected abstract bool AcceptCommand(string command);
protected virtual void InitializeConsole()
{
@ -208,6 +207,11 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -208,6 +207,11 @@ namespace ICSharpCode.SharpDevelop.Gui
console.editor.Document.UndoStack.ClearAll();
}
protected void AppendLine(string text)
{
console.Append(text + Environment.NewLine);
}
protected void Append(string text)
{
console.Append(text);

Loading…
Cancel
Save