Browse Source

Fixed potential stack overflow in DockContentHandler.cs.

Activate F# interactive interpreter.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2970 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts 3.0-Beta1
Daniel Grunwald 18 years ago
parent
commit
7ef5417928
  1. 98
      data/resources/layouts/Debug.xml
  2. 15
      data/resources/layouts/Default.xml
  3. 3
      src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
  4. 2
      src/Libraries/DockPanel_Src/WinFormsUI/Docking/DockContentHandler.cs
  5. 4
      src/Libraries/DockPanel_Src/patchnotes.txt

98
data/resources/layouts/Debug.xml

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--DockPanel configuration file. Author: Weifen Luo, all rights reserved.--> <!--DockPanel configuration file. Author: Weifen Luo, all rights reserved.-->
<!--!!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!--> <!--!!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!-->
<DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="2"> <DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.171180555555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="4">
<Contents Count="29"> <Contents Count="28">
<Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
@ -14,7 +14,7 @@
<Content ID="8" PersistString="ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="8" PersistString="ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="9" PersistString="ICSharpCode.CodeCoverage.CodeCoveragePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="9" PersistString="ICSharpCode.CodeCoverage.CodeCoveragePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="10" PersistString="ICSharpCode.SharpDevelop.Gui.DefinitionViewPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="10" PersistString="ICSharpCode.SharpDevelop.Gui.DefinitionViewPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="11" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="11" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="12" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="12" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="13" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="13" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="14" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="14" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
@ -26,14 +26,13 @@
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="20" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="21" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="22" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="ICSharpCode.SharpDevelop.Gui.ToolsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="23" PersistString="ICSharpCode.SharpDevelop.Gui.ToolsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="ClassDiagramAddin.ClassEditorPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="24" PersistString="ClassDiagramAddin.ClassEditorPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="25" PersistString="ICSharpCode.UnitTesting.UnitTestsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="25" PersistString="ICSharpCode.UnitTesting.UnitTestsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="SharpServerTools.Forms.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="26" PersistString="FSharpBinding.FSharpInteractive" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="27" PersistString="FSharpBinding.FSharpInteractive" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="27" PersistString="ICSharpCode.ServerTools.ServerBrowserHost" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="28" PersistString="ICSharpCode.ServerTools.ServerBrowserHost" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
</Contents> </Contents>
<Panes Count="7"> <Panes Count="10">
<Pane ID="0" DockState="DockLeft" ActiveContent="0"> <Pane ID="0" DockState="DockLeft" ActiveContent="0">
<Contents Count="3"> <Contents Count="3">
<Content ID="0" RefID="0" /> <Content ID="0" RefID="0" />
@ -47,19 +46,16 @@
<Content ID="1" RefID="8" /> <Content ID="1" RefID="8" />
</Contents> </Contents>
</Pane> </Pane>
<Pane ID="2" DockState="DockRight" ActiveContent="14"> <Pane ID="2" DockState="DockRight" ActiveContent="-1">
<Contents Count="11"> <Contents Count="8">
<Content ID="0" RefID="20" /> <Content ID="0" RefID="20" />
<Content ID="1" RefID="16" /> <Content ID="1" RefID="16" />
<Content ID="2" RefID="17" /> <Content ID="2" RefID="17" />
<Content ID="3" RefID="18" /> <Content ID="3" RefID="18" />
<Content ID="4" RefID="14" /> <Content ID="4" RefID="19" />
<Content ID="5" RefID="19" /> <Content ID="5" RefID="23" />
<Content ID="6" RefID="11" /> <Content ID="6" RefID="24" />
<Content ID="7" RefID="23" /> <Content ID="7" RefID="5" />
<Content ID="8" RefID="24" />
<Content ID="9" RefID="25" />
<Content ID="10" RefID="26" />
</Contents> </Contents>
</Pane> </Pane>
<Pane ID="3" DockState="Float" ActiveContent="-1"> <Pane ID="3" DockState="Float" ActiveContent="-1">
@ -71,16 +67,17 @@
</Contents> </Contents>
</Pane> </Pane>
<Pane ID="4" DockState="DockBottom" ActiveContent="4"> <Pane ID="4" DockState="DockBottom" ActiveContent="4">
<Contents Count="9"> <Contents Count="10">
<Content ID="0" RefID="2" /> <Content ID="0" RefID="2" />
<Content ID="1" RefID="4" /> <Content ID="1" RefID="4" />
<Content ID="2" RefID="12" /> <Content ID="2" RefID="3" />
<Content ID="3" RefID="3" /> <Content ID="3" RefID="15" />
<Content ID="4" RefID="15" /> <Content ID="4" RefID="10" />
<Content ID="5" RefID="10" /> <Content ID="5" RefID="9" />
<Content ID="6" RefID="9" /> <Content ID="6" RefID="8" />
<Content ID="7" RefID="8" /> <Content ID="7" RefID="7" />
<Content ID="8" RefID="7" /> <Content ID="8" RefID="26" />
<Content ID="9" RefID="14" />
</Contents> </Contents>
</Pane> </Pane>
<Pane ID="5" DockState="Float" ActiveContent="-1"> <Pane ID="5" DockState="Float" ActiveContent="-1">
@ -88,38 +85,57 @@
<Content ID="0" RefID="5" /> <Content ID="0" RefID="5" />
</Contents> </Contents>
</Pane> </Pane>
<Pane ID="6" DockState="DockRight" ActiveContent="13"> <Pane ID="6" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="13" />
</Contents>
</Pane>
<Pane ID="7" DockState="DockBottom" ActiveContent="12">
<Contents Count="2"> <Contents Count="2">
<Content ID="0" RefID="5" /> <Content ID="0" RefID="12" />
<Content ID="1" RefID="13" /> <Content ID="1" RefID="13" />
</Contents> </Contents>
</Pane> </Pane>
<Pane ID="8" DockState="Float" ActiveContent="-1">
<Contents Count="3">
<Content ID="0" RefID="11" />
<Content ID="1" RefID="25" />
<Content ID="2" RefID="14" />
</Contents>
</Pane>
<Pane ID="9" DockState="DockRight" ActiveContent="-1">
<Contents Count="2">
<Content ID="0" RefID="11" />
<Content ID="1" RefID="25" />
</Contents>
</Pane>
</Panes> </Panes>
<DockWindows> <DockWindows>
<DockWindow ID="0" DockState="Document" ZOrderIndex="0"> <DockWindow ID="0" DockState="Document" ZOrderIndex="0">
<NestedPanes Count="0" /> <NestedPanes Count="0" />
</DockWindow> </DockWindow>
<DockWindow ID="1" DockState="DockLeft" ZOrderIndex="2"> <DockWindow ID="1" DockState="DockLeft" ZOrderIndex="3">
<NestedPanes Count="1"> <NestedPanes Count="1">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Bottom" Proportion="0.5" /> <Pane ID="0" RefID="0" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</NestedPanes> </NestedPanes>
</DockWindow> </DockWindow>
<DockWindow ID="2" DockState="DockRight" ZOrderIndex="4"> <DockWindow ID="2" DockState="DockRight" ZOrderIndex="1">
<NestedPanes Count="2"> <NestedPanes Count="2">
<Pane ID="0" RefID="6" PrevPane="-1" Alignment="Bottom" Proportion="0.5" /> <Pane ID="0" RefID="2" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="2" PrevPane="6" Alignment="Top" Proportion="0.448698068101053" /> <Pane ID="1" RefID="9" PrevPane="2" Alignment="Left" Proportion="0.5" />
</NestedPanes> </NestedPanes>
</DockWindow> </DockWindow>
<DockWindow ID="3" DockState="DockTop" ZOrderIndex="1"> <DockWindow ID="3" DockState="DockTop" ZOrderIndex="2">
<NestedPanes Count="0" /> <NestedPanes Count="0" />
</DockWindow> </DockWindow>
<DockWindow ID="4" DockState="DockBottom" ZOrderIndex="3"> <DockWindow ID="4" DockState="DockBottom" ZOrderIndex="4">
<NestedPanes Count="1"> <NestedPanes Count="2">
<Pane ID="0" RefID="4" PrevPane="-1" Alignment="Right" Proportion="0.5" /> <Pane ID="0" RefID="4" PrevPane="-1" Alignment="Right" Proportion="0.5" />
<Pane ID="1" RefID="7" PrevPane="4" Alignment="Right" Proportion="0.490625" />
</NestedPanes> </NestedPanes>
</DockWindow> </DockWindow>
</DockWindows> </DockWindows>
<FloatWindows Count="3"> <FloatWindows Count="5">
<FloatWindow ID="0" Bounds="367, 404, 300, 300" ZOrderIndex="0"> <FloatWindow ID="0" Bounds="367, 404, 300, 300" ZOrderIndex="0">
<NestedPanes Count="1"> <NestedPanes Count="1">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Right" Proportion="0.5" /> <Pane ID="0" RefID="1" PrevPane="-1" Alignment="Right" Proportion="0.5" />
@ -135,5 +151,15 @@
<Pane ID="0" RefID="5" PrevPane="-1" Alignment="Right" Proportion="0.5" /> <Pane ID="0" RefID="5" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes> </NestedPanes>
</FloatWindow> </FloatWindow>
<FloatWindow ID="3" Bounds="629, 139, 550, 259" ZOrderIndex="3">
<NestedPanes Count="1">
<Pane ID="0" RefID="6" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
<FloatWindow ID="4" Bounds="815, 244, 300, 300" ZOrderIndex="4">
<NestedPanes Count="1">
<Pane ID="0" RefID="8" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
</FloatWindows> </FloatWindows>
</DockPanel> </DockPanel>

15
data/resources/layouts/Default.xml

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--DockPanel configuration file. Author: Weifen Luo, all rights reserved.--> <!--DockPanel configuration file. Author: Weifen Luo, all rights reserved.-->
<!--!!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!--> <!--!!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!-->
<DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="0"> <DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="-1">
<Contents Count="29"> <Contents Count="28">
<Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
@ -29,20 +29,18 @@
<Content ID="23" PersistString="ICSharpCode.UnitTesting.UnitTestsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="23" PersistString="ICSharpCode.UnitTesting.UnitTestsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="ICSharpCode.SharpDevelop.Gui.ToolsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" /> <Content ID="24" PersistString="ICSharpCode.SharpDevelop.Gui.ToolsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="25" PersistString="ClassDiagramAddin.ClassEditorPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="25" PersistString="ClassDiagramAddin.ClassEditorPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="SharpServerTools.Forms.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="26" PersistString="FSharpBinding.FSharpInteractive" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="27" PersistString="FSharpBinding.FSharpInteractive" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" /> <Content ID="27" PersistString="ICSharpCode.ServerTools.ServerBrowserHost" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="28" PersistString="ICSharpCode.ServerTools.ServerBrowserHost" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
</Contents> </Contents>
<Panes Count="5"> <Panes Count="5">
<Pane ID="0" DockState="DockRight" ActiveContent="5"> <Pane ID="0" DockState="DockRight" ActiveContent="5">
<Contents Count="7"> <Contents Count="6">
<Content ID="0" RefID="5" /> <Content ID="0" RefID="5" />
<Content ID="1" RefID="1" /> <Content ID="1" RefID="1" />
<Content ID="2" RefID="12" /> <Content ID="2" RefID="12" />
<Content ID="3" RefID="13" /> <Content ID="3" RefID="13" />
<Content ID="4" RefID="23" /> <Content ID="4" RefID="23" />
<Content ID="5" RefID="25" /> <Content ID="5" RefID="25" />
<Content ID="6" RefID="26" />
</Contents> </Contents>
</Pane> </Pane>
<Pane ID="1" DockState="DockLeft" ActiveContent="0"> <Pane ID="1" DockState="DockLeft" ActiveContent="0">
@ -62,7 +60,7 @@
</Contents> </Contents>
</Pane> </Pane>
<Pane ID="3" DockState="DockBottom" ActiveContent="4"> <Pane ID="3" DockState="DockBottom" ActiveContent="4">
<Contents Count="8"> <Contents Count="9">
<Content ID="0" RefID="2" /> <Content ID="0" RefID="2" />
<Content ID="1" RefID="4" /> <Content ID="1" RefID="4" />
<Content ID="2" RefID="3" /> <Content ID="2" RefID="3" />
@ -71,6 +69,7 @@
<Content ID="5" RefID="8" /> <Content ID="5" RefID="8" />
<Content ID="6" RefID="15" /> <Content ID="6" RefID="15" />
<Content ID="7" RefID="9" /> <Content ID="7" RefID="9" />
<Content ID="8" RefID="26" />
</Contents> </Contents>
</Pane> </Pane>
<Pane ID="4" DockState="DockRight" ActiveContent="-1"> <Pane ID="4" DockState="DockRight" ActiveContent="-1">

3
src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin

@ -93,7 +93,6 @@
resource = "F#.FileIcon"/> resource = "F#.FileIcon"/>
</Path> </Path>
<!-- Disabled F# interactive pad temporarily.
<Path name = "/SharpDevelop/Workbench/Pads"> <Path name = "/SharpDevelop/Workbench/Pads">
<Pad id = "FSharpInteractive" <Pad id = "FSharpInteractive"
category = "Main" category = "Main"
@ -111,7 +110,7 @@
class= "FSharpBinding.SentToFSharpInteractive"/> class= "FSharpBinding.SentToFSharpInteractive"/>
</Condition> </Condition>
</Path> </Path>
-->
<Path path = "/SharpDevelop/Workbench/LanguageBindings"> <Path path = "/SharpDevelop/Workbench/LanguageBindings">
<LanguageBinding id = "F#" <LanguageBinding id = "F#"
guid = "{982E8BC1-ACD7-4dbf-96AB-B2CE67D6A008}" guid = "{982E8BC1-ACD7-4dbf-96AB-B2CE67D6A008}"

2
src/Libraries/DockPanel_Src/WinFormsUI/Docking/DockContentHandler.cs

@ -763,6 +763,8 @@ System.InvalidOperationException: Invalid Content: ActiveContent must be one oft
if (DockState == DockState.Unknown) if (DockState == DockState.Unknown)
Show(dockPanel, DefaultShowState); Show(dockPanel, DefaultShowState);
else if (Pane == null)
Show(dockPanel, DockState == DockState.Hidden ? DefaultShowState : DockState);
else else
Activate(); Activate();
} }

4
src/Libraries/DockPanel_Src/patchnotes.txt

@ -20,3 +20,7 @@ Patch #3:
This fixes the System.InvalidOperationException: Invalid Content: ActiveContent must be one ofthe visible contents, or null if there is no visible content. This fixes the System.InvalidOperationException: Invalid Content: ActiveContent must be one ofthe visible contents, or null if there is no visible content.
that occurs on layout changes iff no document is open and a pad has the focus. that occurs on layout changes iff no document is open and a pad has the focus.
Committed in revision 2751. Committed in revision 2751.
Patch #4:
Prevent stack overflow in DockContentHandler.cs when showing a pad in certain layout configurations.
Committed in revision 2970.

Loading…
Cancel
Save