Browse Source

Merge branch 'newNR' of github.com:icsharpcode/SharpDevelop into newNR

pull/59/merge
Peter Forstmeier 12 years ago
parent
commit
e21a7c82c4
  1. 14
      data/resources/image/BitmapResources/BitmapList.txt
  2. 0
      data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.Collection.png
  3. 0
      data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.OpenCollection.png
  4. 13
      data/resources/image/BitmapResources/BitmapResources.res
  5. BIN
      data/resources/image/BitmapResources/ClassBrowserIcons/AssemblyFromFile.png
  6. BIN
      data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.Assembly.png
  7. BIN
      data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.AssemblyError.png
  8. BIN
      data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.AssemblyFromFile.png
  9. BIN
      data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.AssemblyFromGAC.png
  10. BIN
      data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.Module.png
  11. BIN
      data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.ModuleError.png
  12. BIN
      data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.Workspace.png
  13. BIN
      data/resources/image/BitmapResources/DebuggerIcons/Icons.16x16.Debug.Assembly.png
  14. 2
      src/AddIns/Analysis/UnitTesting/UnitTesting.addin
  15. 6
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs
  16. 4
      src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingTextEditorViewContent.cs
  17. 11
      src/AddIns/BackendBindings/Scripting/Test/Utils/MockEditableViewContent.cs
  18. 11
      src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorViewContent.cs
  19. 10
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesigner.cs
  20. 3
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesignerDisplayBinding.cs
  21. 9
      src/AddIns/BackendBindings/WixBinding/Test/Utils/MockTextEditorViewContent.cs
  22. 5
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataGenerator.cs
  23. 4
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/Extensions.cs
  24. 3
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/MarkupExtensionInfo.cs
  25. 8
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/Options/CodeCompletion.xaml.cs
  26. 1
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/Options/XamlBindingOptions.cs
  27. 1
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/PropertyPathSegment.cs
  28. 10
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/Utils.cs
  29. 2
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlAstResolver.cs
  30. 3
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBehavior.cs
  31. 5
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs
  32. 9
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlConst.cs
  33. 6
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContext.cs
  34. 1
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContextResolver.cs
  35. 1
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlLanguageBinding.cs
  36. 1
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineContentHost.xaml.cs
  37. 2
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineNode.cs
  38. 8
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlParser.cs
  39. 4
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlSymbolSearch.cs
  40. 40
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlUnresolvedFile.cs
  41. 4
      src/AddIns/Debugger/Debugger.AddIn/Pads/ClassBrowserSupport.cs
  42. 87
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs
  43. 172
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs
  44. 7
      src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.Designer.cs
  45. 3
      src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.cs
  46. 29
      src/AddIns/DisplayBindings/ILSpyAddIn/ViewContent/DecompiledViewContent.cs
  47. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfDisplayBinding.cs
  48. 11
      src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockTextEditorProviderViewContent.cs
  49. 6
      src/AddIns/DisplayBindings/XmlEditor/Test/XPath/RemoveXPathHighlightingCommandTestFixture.cs
  50. 4
      src/AddIns/Misc/AddInManager2/Project/AddInManager2.csproj
  51. 4
      src/AddIns/Misc/AddinScout/Project/Src/Gui/AddinTreeView.cs
  52. 4
      src/AddIns/Misc/AddinScout/Project/Src/Gui/TreeTreeView.cs
  53. 4
      src/AddIns/Misc/SearchAndReplace/Project/Gui/DefaultSearchResult.cs
  54. 16
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Utils/CaretNavigationTests.cs
  55. 97
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/TextUtilities.cs
  56. 200
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretNavigationCommandHandler.cs
  57. 48
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/EditingCommandHandler.cs
  58. 16
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/SimpleSelection.cs
  59. 4
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/SingleCharacterElementGenerator.cs
  60. 13
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLine.cs
  61. 11
      src/Libraries/SharpTreeView/ICSharpCode.TreeView/SharpTreeView.cs
  62. 15
      src/Main/Base/Project/Dom/ClassBrowser/AssemblyTreeNode.cs
  63. 27
      src/Main/Base/Project/Dom/ClassBrowser/TypeDefinitionTreeNode.cs
  64. 27
      src/Main/Base/Project/Dom/ClassBrowser/WorkspaceTreeNode.cs
  65. 11
      src/Main/Base/Project/Dom/IAssemblyModel.cs
  66. 31
      src/Main/Base/Project/Dom/IEntityModelContext.cs
  67. 10
      src/Main/Base/Project/Editor/Bookmarks/BookmarkPad.cs
  68. 110
      src/Main/Base/Project/Editor/CodeCompletion/SnippetCompletionData.cs
  69. 9
      src/Main/Base/Project/Editor/ITextEditor.cs
  70. 42
      src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
  71. 1
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  72. 2
      src/Main/Base/Project/Src/Commands/SharpDevelopRoutedCommands.cs
  73. 1
      src/Main/Base/Project/Src/Editor/Dialogs/RenameSymbolDialog.xaml.cs
  74. 2
      src/Main/Base/Project/Src/Gui/Pads/AbstractConsolePad.cs
  75. 46
      src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs
  76. 6
      src/Main/SharpDevelop/Dom/AssemblyModel.cs
  77. 207
      src/Main/SharpDevelop/Dom/ClassBrowser/ClassBrowserPad.cs
  78. 4
      src/Main/SharpDevelop/Dom/ClassBrowser/ClassBrowserTreeNodesFactory.cs
  79. 85
      src/Main/SharpDevelop/Dom/ClassBrowser/Commands.cs
  80. 18
      src/Main/SharpDevelop/Dom/ClassBrowser/OpenAssemblyCommand.cs
  81. 46
      src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml
  82. 188
      src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml.cs
  83. BIN
      src/Main/SharpDevelop/Resources/BitmapResources.resources
  84. 7
      src/Main/SharpDevelop/SharpDevelop.csproj
  85. 6
      src/Main/SharpDevelop/Workbench/FileService.cs

14
data/resources/image/BitmapResources/BitmapList.txt

@ -23,7 +23,7 @@ BitmapResources-data\Icons.16x16.AdjustColor.png @@ -23,7 +23,7 @@ BitmapResources-data\Icons.16x16.AdjustColor.png
BitmapResources-data\Icons.16x16.ArrowDown.png
BitmapResources-data\Icons.16x16.ArrowLeftRight.png
BitmapResources-data\Icons.16x16.ArrowUp.png
BitmapResources-data\Icons.16x16.Assembly.png
BitmapResources-data\Icons.16x16.Collection.png
BitmapResources-data\Icons.16x16.BoldText.png
BitmapResources-data\Icons.16x16.BrowserAfter.png
BitmapResources-data\Icons.16x16.BrowserBefore.png
@ -85,7 +85,7 @@ BitmapResources-data\Icons.16x16.LowerToUpperCase.png @@ -85,7 +85,7 @@ BitmapResources-data\Icons.16x16.LowerToUpperCase.png
BitmapResources-data\Icons.16x16.MyComputer.png
BitmapResources-data\Icons.16x16.NETWORK.png
BitmapResources-data\Icons.16x16.OK.png
BitmapResources-data\Icons.16x16.OpenAssembly.png
BitmapResources-data\Icons.16x16.OpenCollection.png
BitmapResources-data\Icons.16x16.OutDent.png
BitmapResources-data\Icons.16x16.PasteIcon.png
BitmapResources-data\Icons.16x16.PersonalFiles.png
@ -140,7 +140,9 @@ SharpQueryIcons\Icons.16x16.SharpQuery.Column.png @@ -140,7 +140,9 @@ SharpQueryIcons\Icons.16x16.SharpQuery.Column.png
SharpQueryIcons\Icons.16x16.SharpQuery.NodeError.png
SharpQueryIcons\Icons.16x16.SharpQuery.Remove.png
SharpQueryIcons\Icons.16x16.SharpQuery.Table.png
ClassBrowserIcons\Icons.16x16.Workspace.png
ClassBrowserIcons\Icons.16x16.Assembly.png
ClassBrowserIcons\Icons.16x16.AssemblyError.png
-------------------------------------------------------------------------------
Copied from the Fugue Icon Library and modified or mashed up with other Fugue
@ -239,6 +241,11 @@ CodeCoverageIcons\CodeCoverage.Icons.16x16.Pad.png @@ -239,6 +241,11 @@ CodeCoverageIcons\CodeCoverage.Icons.16x16.Pad.png
CodeCoverageIcons\CodeCoverage.Icons.16x16.Run.png
DebuggerIcons\Icons.16x16.Debug.Start.png
DebuggerIcons\Icons.16x16.Debug.StartWithoutDebugging.png
DebuggerIcons\Icons.16x16.Debug.Assembly.png
ClassBrowserIcons\Icons.16x16.Module.png
ClassBrowserIcons\Icons.16x16.ModuleError.png
ClassBrowserIcons\Icons.16x16.AssemblyFromFile.png
ClassBrowserIcons\Icons.16x16.AssemblyFromGAC.png
NavigationIcons\Icons.16x16.NavigateBack.disabled.png
NavigationIcons\Icons.16x16.NavigateBack.png
NavigationIcons\Icons.16x16.NavigateForward.png
@ -556,7 +563,6 @@ ClassBrowserIcons\Icons.16x16.Operator.png @@ -556,7 +563,6 @@ ClassBrowserIcons\Icons.16x16.Operator.png
ClassBrowserIcons\Icons.16x16.Parameter.png
ClassBrowserIcons\Icons.16x16.Struct.png
-------------------------------------------------------------------------------
Left original (other source than Fugue Iconlibrary)
-------------------------------------------------------------------------------

0
data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.Assembly.png → data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.Collection.png

Before

Width:  |  Height:  |  Size: 436 B

After

Width:  |  Height:  |  Size: 436 B

0
data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.OpenAssembly.png → data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.OpenCollection.png

Before

Width:  |  Height:  |  Size: 628 B

After

Width:  |  Height:  |  Size: 628 B

13
data/resources/image/BitmapResources/BitmapResources.res

@ -86,6 +86,7 @@ Icons.16x16.Debug.Continue = DebuggerIcons\Icons.16x16.Debug.Continue.png @@ -86,6 +86,7 @@ Icons.16x16.Debug.Continue = DebuggerIcons\Icons.16x16.Debug.Continue.png
Icons.16x16.Debug.StepOver = DebuggerIcons\Icons.16x16.Debug.StepOver.png
Icons.16x16.Debug.StepInto = DebuggerIcons\Icons.16x16.Debug.StepInto.png
Icons.16x16.Debug.StepOut = DebuggerIcons\Icons.16x16.Debug.StepOut.png
Icons.16x16.Debug.Assembly = DebuggerIcons\Icons.16x16.Debug.Assembly.png
# TestRunner
Icons.16x16.TestRunner.Yellow = BitmapResources-data\Icons.16x16.TestRunner.Yellow.png
@ -107,7 +108,7 @@ Icons.16x16.AdjustBackgroundColor = BitmapResources-data\Icons.16x16.AdjustB @@ -107,7 +108,7 @@ Icons.16x16.AdjustBackgroundColor = BitmapResources-data\Icons.16x16.AdjustB
Icons.16x16.HelpOpenFolder = BitmapResources-data\Icons.16x16.HelpOpenFolder.png
Icons.16x16.SmallIconsIcon = BitmapResources-data\Icons.16x16.SmallIconsIcon.png
Icons.16x16.HtmlElements.AnchorElement = BitmapResources-data\Icons.16x16.HtmlElements.AnchorElement.png
Icons.16x16.Assembly = BitmapResources-data\Icons.16x16.Assembly.png
Icons.16x16.Collection = BitmapResources-data\Icons.16x16.Collection.png
Icons.16x16.TipOfTheDay = BitmapResources-data\Icons.16x16.TipOfTheDay.png
Icons.16x16.Right = BitmapResources-data\Icons.16x16.Right.png
Icons.16x16.CDROM = BitmapResources-data\Icons.16x16.CDROM.png
@ -169,7 +170,7 @@ Icons.16x16.BuildCurrentSelectedProject = BitmapResources-data\Icons.16x16.Bu @@ -169,7 +170,7 @@ Icons.16x16.BuildCurrentSelectedProject = BitmapResources-data\Icons.16x16.Bu
Icons.16x16.HelpTopic = BitmapResources-data\Icons.16x16.HelpTopic.png
Icons.16x16.PrevWindowIcon = BitmapResources-data\Icons.16x16.PrevWindowIcon.png
Icons.16x16.HtmlElements.SelectElement = BitmapResources-data\Icons.16x16.HtmlElements.SelectElement.png
Icons.16x16.OpenAssembly = BitmapResources-data\Icons.16x16.OpenAssembly.png
Icons.16x16.OpenCollection = BitmapResources-data\Icons.16x16.OpenCollection.png
Icons.16x16.HtmlElements.InputSubmitElement = BitmapResources-data\Icons.16x16.HtmlElements.InputSubmitElement.png
Icons.16x16.CancelIcon = BitmapResources-data\Icons.16x16.CancelIcon.png
Icons.16x16.ItalicText = BitmapResources-data\Icons.16x16.ItalicText.png
@ -292,6 +293,14 @@ Icons.16x16.SharpQuery.AddConnection = SharpQueryIcons\Icons.16x16.SharpQuery @@ -292,6 +293,14 @@ Icons.16x16.SharpQuery.AddConnection = SharpQueryIcons\Icons.16x16.SharpQuery
Icons.16x16.SharpQuery.Remove = SharpQueryIcons\Icons.16x16.SharpQuery.Remove.png
#ClassBrowser icons
Icons.16x16.AssemblyFromFile = ClassBrowserIcons\Icons.16x16.AssemblyFromFile.png
Icons.16x16.AssemblyFromGAC = ClassBrowserIcons\Icons.16x16.AssemblyFromGAC.png
Icons.16x16.Workspace = ClassBrowserIcons\Icons.16x16.Workspace.png
Icons.16x16.Assembly = ClassBrowserIcons\Icons.16x16.Assembly.png
Icons.16x16.AssemblyError = ClassBrowserIcons\Icons.16x16.AssemblyError.png
Icons.16x16.Module = ClassBrowserIcons\Icons.16x16.Module.png
Icons.16x16.ModuleError = ClassBrowserIcons\Icons.16x16.ModuleError.png
Icons.16x16.NameSpace = ClassBrowserIcons\Icons.16x16.NameSpace.png
Icons.16x16.Literal = ClassBrowserIcons\Icons.16x16.Literal.png
Icons.16x16.Reference = ClassBrowserIcons\Icons.16x16.Reference.png

BIN
data/resources/image/BitmapResources/ClassBrowserIcons/AssemblyFromFile.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 663 B

BIN
data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.Assembly.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 609 B

BIN
data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.AssemblyError.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 713 B

BIN
data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.AssemblyFromFile.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 777 B

BIN
data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.AssemblyFromGAC.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 B

BIN
data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.Module.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 749 B

BIN
data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.ModuleError.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 822 B

BIN
data/resources/image/BitmapResources/ClassBrowserIcons/Icons.16x16.Workspace.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 706 B

BIN
data/resources/image/BitmapResources/DebuggerIcons/Icons.16x16.Debug.Assembly.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 525 B

2
src/AddIns/Analysis/UnitTesting/UnitTesting.addin

@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
class="ICSharpCode.UnitTesting.AddNUnitReferenceCommand"/>
<ToolbarItem id = "CollapseSeparator" type = "Separator"/>
<ToolbarItem id = "Collapse"
icon = "Icons.16x16.Assembly"
icon = "Icons.16x16.Collection"
tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
class = "ICSharpCode.UnitTesting.CollapseAllTestsCommand"/>
</Condition>

6
src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs

@ -11,10 +11,9 @@ using ICSharpCode.NRefactory.CSharp.Resolver; @@ -11,10 +11,9 @@ using ICSharpCode.NRefactory.CSharp.Resolver;
using ICSharpCode.NRefactory.Completion;
using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.CSharp.Completion;
using ICSharpCode.NRefactory.CSharp.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
namespace CSharpBinding.Completion
{
@ -127,7 +126,8 @@ namespace CSharpBinding.Completion @@ -127,7 +126,8 @@ namespace CSharpBinding.Completion
IEnumerable<ICompletionData> ICompletionDataFactory.CreateCodeTemplateCompletionData()
{
yield break;
return completionContext.Editor.GetSnippets().OfType<ISnippetCompletionItem>()
.Select(snippet => new SnippetCompletionData(snippet));
}
IEnumerable<ICompletionData> ICompletionDataFactory.CreatePreProcessorDefinesCompletionData()

4
src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingTextEditorViewContent.cs

@ -29,8 +29,8 @@ namespace ICSharpCode.Scripting @@ -29,8 +29,8 @@ namespace ICSharpCode.Scripting
void Init(IViewContent view)
{
this.view = view;
editable = view as IEditable;
textEditor = view.GetService(typeof(ITextEditor)) as ITextEditor;
editable = view.GetService<IEditable>();
textEditor = view.GetService<ITextEditor>();
textEditorOptions = textEditor.Options;
}

11
src/AddIns/BackendBindings/Scripting/Test/Utils/MockEditableViewContent.cs

@ -12,7 +12,7 @@ namespace ICSharpCode.Scripting.Tests.Utils @@ -12,7 +12,7 @@ namespace ICSharpCode.Scripting.Tests.Utils
/// <summary>
/// Mock implementation of the IEditable and IViewContent.
/// </summary>
public class MockEditableViewContent : MockViewContent, IEditable, ITextEditorProvider
public class MockEditableViewContent : MockViewContent, IEditable
{
public MockTextEditor MockTextEditor = new MockTextEditor();
@ -37,15 +37,6 @@ namespace ICSharpCode.Scripting.Tests.Utils @@ -37,15 +37,6 @@ namespace ICSharpCode.Scripting.Tests.Utils
set { MockTextEditor.MockTextEditorOptions = value; }
}
public ITextEditor TextEditor {
get { return MockTextEditor; }
}
public IDocument GetDocumentForFile(OpenedFile file)
{
throw new NotImplementedException();
}
public override object GetService(Type serviceType)
{
if (serviceType == typeof(ITextEditor)) {

11
src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorViewContent.cs

@ -13,7 +13,7 @@ namespace ICSharpCode.Scripting.Tests.Utils @@ -13,7 +13,7 @@ namespace ICSharpCode.Scripting.Tests.Utils
/// A mock IViewContent implementation that also implements the
/// ITextEditorControlProvider interface.
/// </summary>
public class MockTextEditorViewContent : MockViewContent, ITextEditorProvider
public class MockTextEditorViewContent : MockViewContent
{
ITextEditor textEditor;
@ -21,14 +21,5 @@ namespace ICSharpCode.Scripting.Tests.Utils @@ -21,14 +21,5 @@ namespace ICSharpCode.Scripting.Tests.Utils
{
textEditor = new AvalonEditTextEditorAdapter(new TextEditor());
}
public ITextEditor TextEditor {
get { return textEditor; }
}
public IDocument GetDocumentForFile(OpenedFile file)
{
throw new NotImplementedException();
}
}
}

10
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesigner.cs

@ -83,7 +83,7 @@ namespace ICSharpCode.WixBinding @@ -83,7 +83,7 @@ namespace ICSharpCode.WixBinding
// and text selection operations done by the WiX designer actually
// become visible in the text editor.
if (!this.SourceCodeStorage.ContainsFile(file)) {
ITextEditor editor = ((ITextEditorProvider)this.PrimaryViewContent).TextEditor;
ITextEditor editor = this.PrimaryViewContent.GetService<ITextEditor>();
this.SourceCodeStorage.AddFile(file, editor.Document, SD.FileService.DefaultFileEncoding, true);
}
@ -224,13 +224,7 @@ namespace ICSharpCode.WixBinding @@ -224,13 +224,7 @@ namespace ICSharpCode.WixBinding
/// Gets the active text area control.
/// </summary>
ITextEditor ActiveTextEditor {
get {
ITextEditorProvider provider = this.PrimaryViewContent as ITextEditorProvider;
if (provider != null) {
return provider.TextEditor;
}
return null;
}
get { return PrimaryViewContent.GetService<ITextEditor>(); }
}
void AddToErrorList(XmlException ex)

3
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesignerDisplayBinding.cs

@ -37,8 +37,7 @@ namespace ICSharpCode.WixBinding @@ -37,8 +37,7 @@ namespace ICSharpCode.WixBinding
bool IsViewTextEditorProvider(IViewContent view)
{
ITextEditorProvider textEditorProvider = view as ITextEditorProvider;
return textEditorProvider != null;
return view.GetService<ITextEditor>() != null;
}
}
}

9
src/AddIns/BackendBindings/WixBinding/Test/Utils/MockTextEditorViewContent.cs

@ -11,13 +11,18 @@ namespace WixBinding.Tests.Utils @@ -11,13 +11,18 @@ namespace WixBinding.Tests.Utils
/// <summary>
/// Mock IViewContent class that implements the ITextEditorProvider interface.
/// </summary>
public class MockTextEditorViewContent : MockViewContent, ITextEditorProvider
public class MockTextEditorViewContent : MockViewContent
{
public MockTextEditorViewContent()
{
}
public ITextEditor TextEditor { get; set; }
ITextEditor textEditor;
public ITextEditor TextEditor {
get { return textEditor ?? new MockTextEditor(); }
set { textEditor = value; }
}
public IDocument GetDocumentForFile(OpenedFile file)
{

5
src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataGenerator.cs

@ -3,14 +3,10 @@ @@ -3,14 +3,10 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Runtime.InteropServices.ComTypes;
using System.Threading;
using System.Windows.Media;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.CSharp.Resolver;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
@ -20,7 +16,6 @@ using ICSharpCode.NRefactory.Xml; @@ -20,7 +16,6 @@ using ICSharpCode.NRefactory.Xml;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
using ICSharpCode.SharpDevelop.Parser;
namespace ICSharpCode.XamlBinding
{

4
src/AddIns/BackendBindings/XamlBinding/XamlBinding/Extensions.cs

@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
@ -11,16 +10,13 @@ using System.Windows.Media; @@ -11,16 +10,13 @@ using System.Windows.Media;
using System.Xml;
using System.Xml.Linq;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Editor;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.Xml;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
using ICSharpCode.XmlEditor;
namespace ICSharpCode.XamlBinding
{

3
src/AddIns/BackendBindings/XamlBinding/XamlBinding/MarkupExtensionInfo.cs

@ -5,9 +5,6 @@ using System; @@ -5,9 +5,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.SharpDevelop;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.XmlEditor;
using System.Text;
namespace ICSharpCode.XamlBinding

8
src/AddIns/BackendBindings/XamlBinding/XamlBinding/Options/CodeCompletion.xaml.cs

@ -2,14 +2,6 @@ @@ -2,14 +2,6 @@
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using ICSharpCode.SharpDevelop.Gui;

1
src/AddIns/BackendBindings/XamlBinding/XamlBinding/Options/XamlBindingOptions.cs

@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Windows.Media;

1
src/AddIns/BackendBindings/XamlBinding/XamlBinding/PropertyPathSegment.cs

@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
using System;
using System.Linq;
using System.Collections.Generic;
namespace ICSharpCode.XamlBinding
{

10
src/AddIns/BackendBindings/XamlBinding/XamlBinding/Utils.cs

@ -1,18 +1,10 @@ @@ -1,18 +1,10 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using ICSharpCode.NRefactory;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using System.Xml;
using ICSharpCode.Core;
using ICSharpCode.NRefactory.Xml;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.XmlEditor;
using ICSharpCode.NRefactory;
namespace ICSharpCode.XamlBinding
{

2
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlAstResolver.cs

@ -10,8 +10,6 @@ using ICSharpCode.NRefactory.Semantics; @@ -10,8 +10,6 @@ using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem.Implementation;
using ICSharpCode.NRefactory.Xml;
using ICSharpCode.SharpDevelop.Parser;
using ICSharpCode.XmlEditor;
namespace ICSharpCode.XamlBinding
{

3
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBehavior.cs

@ -6,10 +6,7 @@ using System.Diagnostics; @@ -6,10 +6,7 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.Core;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Refactoring;

5
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs

@ -2,16 +2,13 @@ @@ -2,16 +2,13 @@
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.SharpDevelop;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.XmlEditor;
namespace ICSharpCode.XamlBinding
{

9
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlConst.cs

@ -6,15 +6,6 @@ using System.Collections.Generic; @@ -6,15 +6,6 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Threading;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
using ICSharpCode.SharpDevelop.Parser;
namespace ICSharpCode.XamlBinding
{
/// <summary>

6
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContext.cs

@ -4,17 +4,11 @@ @@ -4,17 +4,11 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.IO;
using System.Linq;
using System.Windows.Media;
using System.Xml;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.Xml;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Parser;
using ICSharpCode.XmlEditor;
namespace ICSharpCode.XamlBinding
{

1
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContextResolver.cs

@ -9,7 +9,6 @@ using ICSharpCode.NRefactory.Editor; @@ -9,7 +9,6 @@ using ICSharpCode.NRefactory.Editor;
using ICSharpCode.NRefactory.Xml;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Parser;
namespace ICSharpCode.XamlBinding
{

1
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlLanguageBinding.cs

@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.AvalonEdit.Rendering;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Editor;

1
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineContentHost.xaml.cs

@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
using System;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Threading;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;

2
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineNode.cs

@ -4,8 +4,6 @@ @@ -4,8 +4,6 @@
using System;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using ICSharpCode.NRefactory.Editor;
using ICSharpCode.SharpDevelop.Editor;

8
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlParser.cs

@ -7,13 +7,11 @@ using System.IO; @@ -7,13 +7,11 @@ using System.IO;
using System.Linq;
using System.Threading;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.Core;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Editor;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem.Implementation;
using ICSharpCode.NRefactory.Utils;
using ICSharpCode.NRefactory.Xml;
using ICSharpCode.SharpDevelop;
@ -21,7 +19,6 @@ using ICSharpCode.SharpDevelop.Editor; @@ -21,7 +19,6 @@ using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.Search;
using ICSharpCode.SharpDevelop.Parser;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Refactoring;
namespace ICSharpCode.XamlBinding
{
@ -31,11 +28,6 @@ namespace ICSharpCode.XamlBinding @@ -31,11 +28,6 @@ namespace ICSharpCode.XamlBinding
public class XamlParser : IParser
{
public IReadOnlyList<string> TaskListTokens { get; set; }
// public LanguageProperties Language
// {
// get { return LanguageProperties.CSharp; }
// }
public XamlParser()
{

4
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlSymbolSearch.cs

@ -3,20 +3,16 @@ @@ -3,20 +3,16 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using ICSharpCode.AvalonEdit.Highlighting;
using ICSharpCode.Core;
using ICSharpCode.NRefactory.CSharp.Resolver;
using ICSharpCode.NRefactory.Editor;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.Search;
using ICSharpCode.SharpDevelop.Parser;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Refactoring;

40
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlUnresolvedFile.cs

@ -3,22 +3,13 @@ @@ -3,22 +3,13 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.IO;
using System.Linq;
using System.Threading;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.Core;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Editor;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.TypeSystem.Implementation;
using ICSharpCode.NRefactory.Xml;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Parser;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Refactoring;
namespace ICSharpCode.XamlBinding
{
@ -151,10 +142,12 @@ namespace ICSharpCode.XamlBinding @@ -151,10 +142,12 @@ namespace ICSharpCode.XamlBinding
AXmlElement rootElement = currentDocument.Children.OfType<AXmlElement>().FirstOrDefault();
if (rootElement != null) {
string className = rootElement.GetAttributeValue(XamlConst.XamlNamespace, "Class");
string modifier = rootElement.GetAttributeValue(XamlConst.XamlNamespace, "ClassModifier");
if (className != null) {
TypeDefinition = new DefaultUnresolvedTypeDefinition(className) {
Kind = TypeKind.Class,
UnresolvedFile = file,
Accessibility = Accessibility.Public,
Region = new DomRegion(file.FileName, textDocument.GetLocation(rootElement.StartOffset), textDocument.GetLocation(rootElement.EndOffset))
};
TypeDefinition.Members.Add(
@ -162,6 +155,35 @@ namespace ICSharpCode.XamlBinding @@ -162,6 +155,35 @@ namespace ICSharpCode.XamlBinding
Accessibility = Accessibility.Public,
ReturnType = KnownTypeReference.Void
});
TypeDefinition.Members.Add(
new DefaultUnresolvedField(TypeDefinition, "_contentLoaded") {
Accessibility = Accessibility.Private,
ReturnType = KnownTypeReference.Boolean
});
var connectMember =
new DefaultUnresolvedMethod(TypeDefinition, "Connect") {
Accessibility = Accessibility.Private,
ReturnType = KnownTypeReference.Void
};
connectMember.Parameters.Add(new DefaultUnresolvedParameter(KnownTypeReference.Int32, "connectionId"));
connectMember.Parameters.Add(new DefaultUnresolvedParameter(KnownTypeReference.Object, "target"));
TypeDefinition.Members.Add(connectMember);
connectMember.ExplicitInterfaceImplementations.Add(
new DefaultMemberReference(SymbolKind.Method, new GetClassTypeReference(new FullTypeName(typeof(System.Windows.Markup.IComponentConnector).FullName)), "Connect"));
var browsableAttribute = new DefaultUnresolvedAttribute(new GetClassTypeReference(new FullTypeName(typeof(System.ComponentModel.EditorBrowsableAttribute).FullName)));
browsableAttribute.PositionalArguments.Add(
new SimpleConstantValue(
new GetClassTypeReference(new FullTypeName(typeof(System.ComponentModel.EditorBrowsableAttribute).FullName)), System.ComponentModel.EditorBrowsableState.Never
));
connectMember.Attributes.Add(browsableAttribute);
TypeDefinition.BaseTypes.Add(CreateTypeReference(rootElement.Namespace, rootElement.LocalName));
TypeDefinition.BaseTypes.Add(new GetClassTypeReference(new FullTypeName(typeof(System.Windows.Markup.IComponentConnector).FullName)));
if (modifier != null)
TypeDefinition.Accessibility = ParseAccessibility(modifier);
}
}
base.VisitDocument(document);

4
src/AddIns/Debugger/Debugger.AddIn/Pads/ClassBrowserSupport.cs

@ -106,7 +106,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -106,7 +106,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
public override object Icon {
get {
return IconService.GetImageSource("Icons.16x16.Debug.Start");
return IconService.GetImageSource("Icons.16x16.Debug.Assembly");
}
}
}
@ -125,7 +125,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -125,7 +125,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
public override object Icon {
get {
return IconService.GetImageSource("PadIcons.LoadedModules");
return SD.ResourceService.GetImageSource("Icons.16x16.Module");
}
}

87
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs

@ -24,15 +24,8 @@ using ICSharpCode.SharpDevelop.Workbench; @@ -24,15 +24,8 @@ using ICSharpCode.SharpDevelop.Workbench;
namespace ICSharpCode.AvalonEdit.AddIn
{
[ViewContentService]
public interface ICodeEditorProvider : ITextEditorProvider
{
[Obsolete("Use viewContent.GetService<CodeEditor>() instead.")]
CodeEditor CodeEditor { get; }
}
public class AvalonEditViewContent
: AbstractViewContent, IEditable, IMementoCapable, ICodeEditorProvider, IPositionable, IToolsHost
: AbstractViewContent, IMementoCapable, IToolsHost
{
readonly CodeEditor codeEditor = new CodeEditor();
IAnalyticsMonitorTrackedFeature trackedFeature;
@ -62,8 +55,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -62,8 +55,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
file.IsDirtyChanged += PrimaryFile_IsDirtyChanged;
codeEditor.Document.UndoStack.PropertyChanged += codeEditor_Document_UndoStack_PropertyChanged;
codeEditor.CaretPositionChanged += CaretChanged;
codeEditor.TextCopied += codeEditor_TextCopied;
}
bool IsKnownFileExtension(string filetype)
@ -91,16 +82,7 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -91,16 +82,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
}
}
}
void codeEditor_TextCopied(object sender, ICSharpCode.AvalonEdit.Editing.TextEventArgs e)
{
TextEditorSideBar.Instance.PutInClipboardRing(e.Text);
}
public CodeEditor CodeEditor {
get { return codeEditor; }
}
public override object Control {
get { return codeEditor; }
}
@ -194,25 +176,7 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -194,25 +176,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
public override INavigationPoint BuildNavPoint()
{
int lineNumber = this.Line;
string txt = codeEditor.Document.GetText(codeEditor.Document.GetLineByNumber(lineNumber));
return new TextNavigationPoint(this.PrimaryFileName, lineNumber, this.Column, txt);
}
void CaretChanged(object sender, EventArgs e)
{
NavigationService.Log(this.BuildNavPoint());
var document = codeEditor.Document;
int lineOffset = document.GetLineByNumber(this.Line).Offset;
int chOffset = this.Column;
int col = 1;
for (int i = 1; i < chOffset; i++) {
if (document.GetCharAt(lineOffset + i - 1) == '\t')
col += CodeEditorOptions.Instance.IndentationSize;
else
col += 1;
}
SD.StatusBar.SetCaretPosition(col, this.Line, chOffset);
return codeEditor.BuildNavPoint();
}
public override bool IsReadOnly {
@ -294,22 +258,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -294,22 +258,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
return "[" + GetType().Name + " " + this.PrimaryFileName + "]";
}
#region IEditable
public ITextSource CreateSnapshot()
{
return codeEditor.Document.CreateSnapshot();
}
/// <summary>
/// Gets the document text.
/// </summary>
public string Text {
get {
return codeEditor.Document.Text;
}
}
#endregion
#region IMementoCapable
public Properties CreateMemento()
{
@ -330,35 +278,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -330,35 +278,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
}
#endregion
#region ITextEditorProvider
public ITextEditor TextEditor {
get { return codeEditor.ActiveTextEditorAdapter; }
}
public IDocument GetDocumentForFile(OpenedFile file)
{
if (file == this.PrimaryFile)
return codeEditor.Document;
else
return null;
}
#endregion
#region IPositionable
public int Line {
get { return this.TextEditor.Caret.Line; }
}
public int Column {
get { return this.TextEditor.Caret.Column; }
}
public void JumpTo(int line, int column)
{
codeEditor.ActiveTextEditor.JumpTo(line, column);
}
#endregion
object IToolsHost.ToolsContent {
get { return TextEditorSideBar.Instance; }
}

172
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs

@ -38,17 +38,14 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -38,17 +38,14 @@ namespace ICSharpCode.AvalonEdit.AddIn
/// Also provides support for Split-View (showing two AvalonEdit instances using the same TextDocument)
/// </summary>
[TextEditorService, ViewContentService]
public class CodeEditor : Grid, IDisposable
public class CodeEditor
: Grid, IDisposable, ICSharpCode.SharpDevelop.Gui.IEditable, IFileDocumentProvider, ICSharpCode.SharpDevelop.Gui.IPositionable, IServiceProvider
{
const string contextMenuPath = "/SharpDevelop/ViewContent/AvalonEdit/ContextMenu";
QuickClassBrowser quickClassBrowser;
readonly CodeEditorView primaryTextEditor;
readonly CodeEditorAdapter primaryTextEditorAdapter;
CodeEditorView secondaryTextEditor;
CodeEditorView activeTextEditor;
CodeEditorAdapter secondaryTextEditorAdapter;
GridSplitter gridSplitter;
readonly IconBarManager iconBarManager;
readonly TextMarkerService textMarkerService;
readonly IChangeWatcher changeWatcher;
@ -58,14 +55,9 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -58,14 +55,9 @@ namespace ICSharpCode.AvalonEdit.AddIn
get { return primaryTextEditor; }
}
[Obsolete()]
public CodeEditorView ActiveTextEditor {
get { return activeTextEditor; }
private set {
if (activeTextEditor != value) {
activeTextEditor = value;
HandleCaretPositionChange();
}
}
get { return primaryTextEditor; }
}
TextDocument document;
@ -114,8 +106,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -114,8 +106,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
this.document.FileName = fileName;
primaryTextEditorAdapter.FileNameChanged();
if (secondaryTextEditorAdapter != null)
secondaryTextEditorAdapter.FileNameChanged();
if (this.errorPainter == null) {
this.errorPainter = new ErrorPainter(primaryTextEditorAdapter);
@ -143,12 +133,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -143,12 +133,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
primaryTextEditor.TextArea.TextView.LineTransformers.Insert(0, new HighlightingColorizer(highlighter));
primaryTextEditor.UpdateCustomizedHighlighting();
if (secondaryTextEditor != null) {
secondaryTextEditor.SyntaxHighlighting = highlighting;
secondaryTextEditor.TextArea.TextView.LineTransformers.RemoveAll(t => t is HighlightingColorizer);
secondaryTextEditor.TextArea.TextView.LineTransformers.Insert(0, new HighlightingColorizer(highlighter));
secondaryTextEditor.UpdateCustomizedHighlighting();
}
// Dispose the old highlighter; necessary to avoid memory leaks as
// semantic highlighters might attach to global parser events.
if (oldHighlighter != null) {
@ -159,9 +143,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -159,9 +143,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
public void Redraw(ISegment segment, DispatcherPriority priority)
{
primaryTextEditor.TextArea.TextView.Redraw(segment, priority);
if (secondaryTextEditor != null) {
secondaryTextEditor.TextArea.TextView.Redraw(segment, priority);
}
}
const double minRowHeight = 40;
@ -175,7 +156,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -175,7 +156,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
this.FlowDirection = FlowDirection.LeftToRight; // code editing is always left-to-right
this.document = new TextDocument();
var documentServiceContainer = document.GetRequiredService<IServiceContainer>();
this.CommandBindings.Add(new CommandBinding(SharpDevelopRoutedCommands.SplitView, OnSplitView));
textMarkerService = new TextMarkerService(document);
documentServiceContainer.AddService(typeof(ITextMarkerService), textMarkerService);
@ -189,7 +169,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -189,7 +169,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
primaryTextEditor = CreateTextEditor();
primaryTextEditorAdapter = (CodeEditorAdapter)primaryTextEditor.TextArea.GetService(typeof(ITextEditor));
Debug.Assert(primaryTextEditorAdapter != null);
activeTextEditor = primaryTextEditor;
this.ColumnDefinitions.Add(new ColumnDefinition());
this.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
@ -210,8 +189,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -210,8 +189,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
// CustomizableHighlightingColorizer loads the new values automatically, we just need
// to force a refresh in AvalonEdit.
primaryTextEditor.UpdateCustomizedHighlighting();
if (secondaryTextEditor != null)
secondaryTextEditor.UpdateCustomizedHighlighting();
foreach (var bookmark in SD.BookmarkManager.GetBookmarks(fileName).OfType<SDMarkerBookmark>())
bookmark.SetMarker();
}
@ -228,6 +205,9 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -228,6 +205,9 @@ namespace ICSharpCode.AvalonEdit.AddIn
TextView textView = codeEditorView.TextArea.TextView;
textView.Services.AddService(typeof(ITextEditor), adapter);
textView.Services.AddService(typeof(CodeEditor), this);
textView.Services.AddService(typeof(ICSharpCode.SharpDevelop.Gui.IEditable), this);
textView.Services.AddService(typeof(ICSharpCode.SharpDevelop.Gui.IPositionable), this);
textView.Services.AddService(typeof(IFileDocumentProvider), this);
codeEditorView.TextArea.TextEntering += TextAreaTextEntering;
codeEditorView.TextArea.TextEntered += TextAreaTextEntered;
@ -251,17 +231,13 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -251,17 +231,13 @@ namespace ICSharpCode.AvalonEdit.AddIn
codeEditorView.TextArea.MouseRightButtonDown += TextAreaMouseRightButtonDown;
codeEditorView.TextArea.ContextMenuOpening += TextAreaContextMenuOpening;
codeEditorView.TextArea.TextCopied += textEditor_TextArea_TextCopied;
codeEditorView.GotFocus += textEditor_GotFocus;
return codeEditorView;
}
public event EventHandler<TextEventArgs> TextCopied;
void textEditor_TextArea_TextCopied(object sender, TextEventArgs e)
{
if (TextCopied != null)
TextCopied(this, e);
ICSharpCode.SharpDevelop.Gui.TextEditorSideBar.Instance.PutInClipboardRing(e.Text);
}
protected virtual void DisposeTextEditor(CodeEditorView textEditor)
@ -275,12 +251,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -275,12 +251,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
textEditor.Dispose();
}
void textEditor_GotFocus(object sender, RoutedEventArgs e)
{
Debug.Assert(sender is CodeEditorView);
this.ActiveTextEditor = (CodeEditorView)sender;
}
void TextAreaContextMenuOpening(object sender, ContextMenuEventArgs e)
{
ITextEditor adapter = GetAdapterFromSender(sender);
@ -376,48 +346,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -376,48 +346,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
}
}
void OnSplitView(object sender, ExecutedRoutedEventArgs e)
{
if (secondaryTextEditor == null) {
// create secondary editor
this.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star), MinHeight = minRowHeight });
secondaryTextEditor = CreateTextEditor();
secondaryTextEditorAdapter = (CodeEditorAdapter)secondaryTextEditor.TextArea.GetService(typeof(ITextEditor));
Debug.Assert(primaryTextEditorAdapter != null);
secondaryTextEditor.SetBinding(TextEditor.IsReadOnlyProperty,
new Binding(TextEditor.IsReadOnlyProperty.Name) { Source = primaryTextEditor });
secondaryTextEditor.SyntaxHighlighting = primaryTextEditor.SyntaxHighlighting;
secondaryTextEditor.UpdateCustomizedHighlighting();
gridSplitter = new GridSplitter {
Height = 4,
HorizontalAlignment = HorizontalAlignment.Stretch,
VerticalAlignment = VerticalAlignment.Top
};
SetRow(gridSplitter, 2);
this.Children.Add(gridSplitter);
secondaryTextEditor.Margin = new Thickness(0, 4, 0, 0);
SetRow(secondaryTextEditor, 2);
this.Children.Add(secondaryTextEditor);
secondaryTextEditorAdapter.FileNameChanged();
FetchParseInformation();
} else {
// remove secondary editor
this.Children.Remove(secondaryTextEditor);
this.Children.Remove(gridSplitter);
secondaryTextEditorAdapter.DetachExtensions();
DisposeTextEditor(secondaryTextEditor);
secondaryTextEditor = null;
secondaryTextEditorAdapter = null;
gridSplitter = null;
this.RowDefinitions.RemoveAt(this.RowDefinitions.Count - 1);
this.ActiveTextEditor = primaryTextEditor;
}
}
public event EventHandler CaretPositionChanged;
void TextAreaCaretPositionChanged(object sender, EventArgs e)
@ -433,12 +361,32 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -433,12 +361,32 @@ namespace ICSharpCode.AvalonEdit.AddIn
void HandleCaretPositionChange()
{
if (CaretPositionChanged != null)
CaretPositionChanged(this, EventArgs.Empty);
if (quickClassBrowser != null) {
quickClassBrowser.SelectItemAtCaretPosition(this.ActiveTextEditor.TextArea.Caret.Location);
}
if (CaretPositionChanged != null)
CaretPositionChanged(this, EventArgs.Empty);
NavigationService.Log(this.BuildNavPoint());
var document = this.Document;
int lineOffset = document.GetLineByNumber(this.Line).Offset;
int chOffset = this.Column;
int col = 1;
for (int i = 1; i < chOffset; i++) {
if (document.GetCharAt(lineOffset + i - 1) == '\t')
col += CodeEditorOptions.Instance.IndentationSize;
else
col += 1;
}
SD.StatusBar.SetCaretPosition(col, this.Line, chOffset);
}
public INavigationPoint BuildNavPoint()
{
int lineNumber = this.Line;
string txt = this.Document.GetText(this.Document.GetLineByNumber(lineNumber));
return new TextNavigationPoint(this.FileName, lineNumber, this.Column, txt);
}
volatile static ReadOnlyCollection<ICodeCompletionBinding> codeCompletionBindings;
@ -454,17 +402,63 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -454,17 +402,63 @@ namespace ICSharpCode.AvalonEdit.AddIn
SharpDevelopCompletionWindow CompletionWindow {
get {
return primaryTextEditor.ActiveCompletionWindow
?? (secondaryTextEditor == null ? null : secondaryTextEditor.ActiveCompletionWindow);
return primaryTextEditor.ActiveCompletionWindow;
}
}
SharpDevelopInsightWindow InsightWindow {
get {
return primaryTextEditor.ActiveInsightWindow
?? (secondaryTextEditor == null ? null : secondaryTextEditor.ActiveInsightWindow);
return primaryTextEditor.ActiveInsightWindow;
}
}
#region IEditable
public ITextSource CreateSnapshot()
{
return this.Document.CreateSnapshot();
}
/// <summary>
/// Gets the document text.
/// </summary>
public string Text {
get {
return this.Document.Text;
}
}
#endregion
#region IFileDocumentProvider
public IDocument GetDocumentForFile(ICSharpCode.SharpDevelop.Workbench.OpenedFile file)
{
if (file.FileName == this.FileName)
return this.Document;
else
return null;
}
#endregion
#region IPositionable
public int Line {
get { return this.PrimaryTextEditor.Adapter.Caret.Line; }
}
public int Column {
get { return this.PrimaryTextEditor.Adapter.Caret.Column; }
}
public void JumpTo(int line, int column)
{
this.PrimaryTextEditor.JumpTo(line, column);
}
#endregion
#region IServiceProvider implementation
public object GetService(Type serviceType)
{
return this.primaryTextEditor.Adapter.GetService(serviceType);
}
#endregion
void TextAreaTextEntering(object sender, TextCompositionEventArgs e)
{
@ -635,8 +629,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -635,8 +629,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
}
iconBarManager.UpdateClassMemberBookmarks(parseInfo != null ? parseInfo.UnresolvedFile : null, document);
primaryTextEditor.UpdateParseInformationForFolding(parseInfo);
if (secondaryTextEditor != null)
secondaryTextEditor.UpdateParseInformationForFolding(parseInfo);
}
public void Dispose()
@ -647,8 +639,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -647,8 +639,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
if (primaryTextEditorAdapter.Language != null)
primaryTextEditorAdapter.DetachExtensions();
if (secondaryTextEditorAdapter != null && secondaryTextEditorAdapter.Language != null)
secondaryTextEditorAdapter.DetachExtensions();
if (errorPainter != null)
errorPainter.Dispose();
@ -656,8 +646,6 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -656,8 +646,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
changeWatcher.Dispose();
this.Document = null;
DisposeTextEditor(primaryTextEditor);
if (secondaryTextEditor != null)
DisposeTextEditor(secondaryTextEditor);
}
}
}

7
src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.Designer.cs generated

@ -36,7 +36,7 @@ namespace HexEditor.View @@ -36,7 +36,7 @@ namespace HexEditor.View
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HexEditContainer));
this.tbSizeToFit = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.tCBViewMode = new System.Windows.Forms.DomainUpDown();
this.tCBViewMode = new System.Windows.Forms.ToolStripComboBox();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tSTBCharsPerLine = new System.Windows.Forms.NumericUpDown();
this.toolStripProgressBar1 = new System.Windows.Forms.ToolStripProgressBar();
@ -69,7 +69,8 @@ namespace HexEditor.View @@ -69,7 +69,8 @@ namespace HexEditor.View
"Decimal"});
this.tCBViewMode.Name = "tCBViewMode";
this.tCBViewMode.Size = new System.Drawing.Size(121, 25);
this.tCBViewMode.SelectedItemChanged += new System.EventHandler(this.TCBViewModeSelectedIndexChanged);
this.tCBViewMode.SelectedIndexChanged += new System.EventHandler(this.TCBViewModeSelectedIndexChanged);
this.tCBViewMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
//
// toolStrip1
//
@ -129,7 +130,7 @@ namespace HexEditor.View @@ -129,7 +130,7 @@ namespace HexEditor.View
}
private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar1;
internal HexEditor.Editor hexEditControl;
private System.Windows.Forms.DomainUpDown tCBViewMode;
private System.Windows.Forms.ToolStripComboBox tCBViewMode;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripButton tbSizeToFit;
private System.Windows.Forms.ToolStrip toolStrip1;

3
src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditContainer.cs

@ -51,8 +51,7 @@ namespace HexEditor.View @@ -51,8 +51,7 @@ namespace HexEditor.View
ToolStripControlHost bytesPerLine = new ToolStripControlHost(tSTBCharsPerLine);
this.toolStrip1.Items.Insert(1, bytesPerLine);
ToolStripControlHost viewMode = new ToolStripControlHost(tCBViewMode);
this.toolStrip1.Items.Insert(3, viewMode);
this.toolStrip1.Items.Insert(3, tCBViewMode);
hexEditControl.BytesPerLine = Settings.BytesPerLine;
tSTBCharsPerLine.Text = hexEditControl.BytesPerLine.ToString();

29
src/AddIns/DisplayBindings/ILSpyAddIn/ViewContent/DecompiledViewContent.cs

@ -30,7 +30,7 @@ namespace ICSharpCode.ILSpyAddIn @@ -30,7 +30,7 @@ namespace ICSharpCode.ILSpyAddIn
/// <summary>
/// Hosts a decompiled type.
/// </summary>
class DecompiledViewContent : AbstractViewContentWithoutFile, IPositionable
class DecompiledViewContent : AbstractViewContentWithoutFile
{
readonly FileName assemblyFile;
readonly string fullTypeName;
@ -58,8 +58,7 @@ namespace ICSharpCode.ILSpyAddIn @@ -58,8 +58,7 @@ namespace ICSharpCode.ILSpyAddIn
{
this.VirtualFileName = FileName.Create("ilspy://" + assemblyFile + "/" + fullTypeName + ".cs");
this.Services = codeEditor.PrimaryTextEditor.GetRequiredService<IServiceContainer>();
this.Services.AddService(typeof(IPositionable), this);
this.Services = codeEditor.GetRequiredService<IServiceContainer>();
this.assemblyFile = assemblyFile;
this.fullTypeName = fullTypeName;
@ -178,7 +177,12 @@ namespace ICSharpCode.ILSpyAddIn @@ -178,7 +177,12 @@ namespace ICSharpCode.ILSpyAddIn
// TODO: show Save As dialog to allow the user to save the decompiled file
}
#endregion
public override INavigationPoint BuildNavPoint()
{
return codeEditor.BuildNavPoint();
}
#region JumpToEntity
public void JumpToEntity(string entityIdString)
{
@ -188,7 +192,7 @@ namespace ICSharpCode.ILSpyAddIn @@ -188,7 +192,7 @@ namespace ICSharpCode.ILSpyAddIn
}
TextLocation location;
if (entityIdString != null && memberLocations != null && memberLocations.TryGetValue(entityIdString, out location))
this.JumpTo(location.Line, location.Column);
codeEditor.JumpTo(location.Line, location.Column);
}
#endregion
@ -299,21 +303,6 @@ namespace ICSharpCode.ILSpyAddIn @@ -299,21 +303,6 @@ namespace ICSharpCode.ILSpyAddIn
}
#endregion
#region IPositionable
public int Line {
get { return codeEditor.ActiveTextEditorAdapter.Caret.Line; }
}
public int Column {
get { return codeEditor.ActiveTextEditorAdapter.Caret.Column; }
}
public void JumpTo(int line, int column)
{
codeEditor.ActiveTextEditor.JumpTo(line, column);
}
#endregion
#region Events
public event EventHandler DecompilationFinished;

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfDisplayBinding.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -45,7 +45,7 @@ namespace ICSharpCode.WpfDesign.AddIn
public bool CanAttachTo(IViewContent content)
{
if (Path.GetExtension(content.PrimaryFileName).Equals(".xaml", StringComparison.OrdinalIgnoreCase)) {
IEditable editable = content as IEditable;
IEditable editable = content.GetService<IEditable>();
if (editable != null) {
try {
XmlTextReader r = new XmlTextReader(editable.CreateSnapshot().CreateReader());

11
src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockTextEditorProviderViewContent.cs

@ -9,23 +9,14 @@ using ICSharpCode.SharpDevelop.Workbench; @@ -9,23 +9,14 @@ using ICSharpCode.SharpDevelop.Workbench;
namespace XmlEditor.Tests.Utils
{
public class MockTextEditorProviderViewContent : MockViewContent, ITextEditorProvider
public class MockTextEditorProviderViewContent : MockViewContent
{
MockTextEditor textEditor = new MockTextEditor();
public ITextEditor TextEditor {
get { return textEditor; }
}
public MockTextEditor MockTextEditor {
get { return textEditor; }
}
public IDocument GetDocumentForFile(OpenedFile file)
{
throw new NotImplementedException();
}
public override object GetService(Type serviceType)
{
return textEditor.GetService(serviceType);

6
src/AddIns/DisplayBindings/XmlEditor/Test/XPath/RemoveXPathHighlightingCommandTestFixture.cs

@ -69,11 +69,5 @@ namespace XmlEditor.Tests.XPath @@ -69,11 +69,5 @@ namespace XmlEditor.Tests.XPath
{
Assert.IsTrue(markerService.TextMarkers.Count() > 0);
}
[Test]
public void MockViewContentDoesNotImplementITextEditorProviderInterface()
{
Assert.IsNull(nonTextEditorProviderView as ITextEditorProvider);
}
}
}

4
src/AddIns/Misc/AddInManager2/Project/AddInManager2.csproj

@ -191,9 +191,7 @@ @@ -191,9 +191,7 @@
<Page Include="Src\View\AddInsView.xaml" />
<Page Include="Src\View\LicenseAcceptanceView.xaml" />
<Page Include="Src\View\PagedResultsView.xaml" />
<Page Include="Src\View\PackageRepositoriesView.xaml">
<DependentUpon>PagedResultsView.xaml</DependentUpon>
</Page>
<Page Include="Src\View\PackageRepositoriesView.xaml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
</Project>

4
src/AddIns/Misc/AddinScout/Project/Src/Gui/AddinTreeView.cs

@ -26,8 +26,8 @@ namespace AddInScout @@ -26,8 +26,8 @@ namespace AddInScout
treeView.ImageList = new ImageList();
treeView.ImageList.ColorDepth = ColorDepth.Depth32Bit;
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Class"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Assembly"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenAssembly"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Collection"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenCollection"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.ClosedFolderBitmap"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenFolderBitmap"));

4
src/AddIns/Misc/AddinScout/Project/Src/Gui/TreeTreeView.cs

@ -23,8 +23,8 @@ namespace AddInScout @@ -23,8 +23,8 @@ namespace AddInScout
treeView.ImageList = new ImageList();
treeView.ImageList.ColorDepth = ColorDepth.Depth32Bit;
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Class"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Assembly"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenAssembly"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Collection"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenCollection"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.ClosedFolderBitmap"));
treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenFolderBitmap"));

4
src/AddIns/Misc/SearchAndReplace/Project/Gui/DefaultSearchResult.cs

@ -87,13 +87,13 @@ namespace SearchAndReplace @@ -87,13 +87,13 @@ namespace SearchAndReplace
Button expandAll = new Button();
expandAll.SetValueToExtension(Button.ToolTipProperty, new LocalizeExtension("MainWindow.Windows.SearchResultPanel.ExpandAll.ToolTip"));
expandAll.Content = new Image { Height = 16, Source = PresentationResourceService.GetBitmapSource("Icons.16x16.OpenAssembly") };
expandAll.Content = new Image { Height = 16, Source = PresentationResourceService.GetBitmapSource("Icons.16x16.OpenCollection") };
expandAll.Click += delegate { ExpandCollapseAll(true); };
toolbarItems.Add(expandAll);
Button collapseAll = new Button();
collapseAll.SetValueToExtension(Button.ToolTipProperty, new LocalizeExtension("MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip"));
collapseAll.Content = new Image { Height = 16, Source = PresentationResourceService.GetBitmapSource("Icons.16x16.Assembly") };
collapseAll.Content = new Image { Height = 16, Source = PresentationResourceService.GetBitmapSource("Icons.16x16.Collection") };
collapseAll.Click += delegate { ExpandCollapseAll(false); };
toolbarItems.Add(collapseAll);
}

16
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Utils/CaretNavigationTests.cs

@ -113,5 +113,21 @@ namespace ICSharpCode.AvalonEdit.Utils @@ -113,5 +113,21 @@ namespace ICSharpCode.AvalonEdit.Utils
Assert.AreEqual(5, GetPrevCaretStop(c, 6, CaretPositioningMode.WordBorder));
Assert.AreEqual(1, GetPrevCaretStop(c, 5, CaretPositioningMode.WordBorder));
}
[Test]
public void CombiningMark()
{
string str = " x͆ ";
Assert.AreEqual(3, GetNextCaretStop(str, 1, CaretPositioningMode.Normal));
Assert.AreEqual(1, GetPrevCaretStop(str, 3, CaretPositioningMode.Normal));
}
[Test]
public void StackedCombiningMark()
{
string str = " x͆͆͆͆ ";
Assert.AreEqual(6, GetNextCaretStop(str, 1, CaretPositioningMode.Normal));
Assert.AreEqual(1, GetPrevCaretStop(str, 6, CaretPositioningMode.Normal));
}
}
}

97
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/TextUtilities.cs

@ -14,7 +14,7 @@ namespace ICSharpCode.AvalonEdit.Document @@ -14,7 +14,7 @@ namespace ICSharpCode.AvalonEdit.Document
public enum CaretPositioningMode
{
/// <summary>
/// Normal positioning (stop at every caret position)
/// Normal positioning (stop after every grapheme)
/// </summary>
Normal,
/// <summary>
@ -32,7 +32,12 @@ namespace ICSharpCode.AvalonEdit.Document @@ -32,7 +32,12 @@ namespace ICSharpCode.AvalonEdit.Document
/// <summary>
/// Stop only on word borders, and anywhere in the middle of symbols.
/// </summary>
WordBorderOrSymbol
WordBorderOrSymbol,
/// <summary>
/// Stop between every Unicode codepoint, even within the same grapheme.
/// This is used to implement deleting the previous grapheme when Backspace is pressed.
/// </summary>
EveryCodepoint
}
/// <summary>
@ -199,37 +204,43 @@ namespace ICSharpCode.AvalonEdit.Document @@ -199,37 +204,43 @@ namespace ICSharpCode.AvalonEdit.Document
{
if (c == '\r' || c == '\n')
return CharacterClass.LineTerminator;
else if (char.IsWhiteSpace(c))
return CharacterClass.Whitespace;
else if (char.IsLetterOrDigit(c) || c == '_')
if (c == '_')
return CharacterClass.IdentifierPart;
else
return CharacterClass.Other;
return GetCharacterClass(char.GetUnicodeCategory(c));
}
static CharacterClass GetCharacterClass(char highSurrogate, char lowSurrogate)
{
if (char.IsSurrogatePair(highSurrogate, lowSurrogate)) {
switch (char.GetUnicodeCategory(highSurrogate.ToString() + lowSurrogate.ToString(), 0)) {
case UnicodeCategory.SpaceSeparator:
case UnicodeCategory.LineSeparator:
case UnicodeCategory.ParagraphSeparator:
return CharacterClass.Whitespace;
case UnicodeCategory.UppercaseLetter:
case UnicodeCategory.LowercaseLetter:
case UnicodeCategory.TitlecaseLetter:
case UnicodeCategory.ModifierLetter:
case UnicodeCategory.OtherLetter:
case UnicodeCategory.DecimalDigitNumber:
return CharacterClass.IdentifierPart;
default:
return CharacterClass.Other;
}
return GetCharacterClass(char.GetUnicodeCategory(highSurrogate.ToString() + lowSurrogate.ToString(), 0));
} else {
// malformed surrogate pair
return CharacterClass.Other;
}
}
static CharacterClass GetCharacterClass(UnicodeCategory c)
{
switch (c) {
case UnicodeCategory.SpaceSeparator:
case UnicodeCategory.LineSeparator:
case UnicodeCategory.ParagraphSeparator:
return CharacterClass.Whitespace;
case UnicodeCategory.UppercaseLetter:
case UnicodeCategory.LowercaseLetter:
case UnicodeCategory.TitlecaseLetter:
case UnicodeCategory.ModifierLetter:
case UnicodeCategory.OtherLetter:
case UnicodeCategory.DecimalDigitNumber:
return CharacterClass.IdentifierPart;
case UnicodeCategory.NonSpacingMark:
case UnicodeCategory.SpacingCombiningMark:
case UnicodeCategory.EnclosingMark:
return CharacterClass.CombiningMark;
default:
return CharacterClass.Other;
}
}
#endregion
#region GetNextCaretPosition
@ -251,13 +262,16 @@ namespace ICSharpCode.AvalonEdit.Document @@ -251,13 +262,16 @@ namespace ICSharpCode.AvalonEdit.Document
{
if (textSource == null)
throw new ArgumentNullException("textSource");
if (mode != CaretPositioningMode.Normal
&& mode != CaretPositioningMode.WordBorder
&& mode != CaretPositioningMode.WordStart
&& mode != CaretPositioningMode.WordBorderOrSymbol
&& mode != CaretPositioningMode.WordStartOrSymbol)
{
throw new ArgumentException("Unsupported CaretPositioningMode: " + mode, "mode");
switch (mode) {
case CaretPositioningMode.Normal:
case CaretPositioningMode.EveryCodepoint:
case CaretPositioningMode.WordBorder:
case CaretPositioningMode.WordBorderOrSymbol:
case CaretPositioningMode.WordStart:
case CaretPositioningMode.WordStartOrSymbol:
break; // OK
default:
throw new ArgumentException("Unsupported CaretPositioningMode: " + mode, "mode");
}
if (direction != LogicalDirection.Backward
&& direction != LogicalDirection.Forward)
@ -267,7 +281,7 @@ namespace ICSharpCode.AvalonEdit.Document @@ -267,7 +281,7 @@ namespace ICSharpCode.AvalonEdit.Document
int textLength = textSource.TextLength;
if (textLength <= 0) {
// empty document? has a normal caret position at 0, though no word borders
if (mode == CaretPositioningMode.Normal) {
if (IsNormal(mode)) {
if (offset > 0 && direction == LogicalDirection.Backward) return 0;
if (offset < 0 && direction == LogicalDirection.Forward) return 0;
}
@ -286,14 +300,14 @@ namespace ICSharpCode.AvalonEdit.Document @@ -286,14 +300,14 @@ namespace ICSharpCode.AvalonEdit.Document
if (nextPos == 0) {
// at the document start, there's only a word border
// if the first character is not whitespace
if (mode == CaretPositioningMode.Normal || !char.IsWhiteSpace(textSource.GetCharAt(0)))
if (IsNormal(mode) || !char.IsWhiteSpace(textSource.GetCharAt(0)))
return nextPos;
} else if (nextPos == textLength) {
// at the document end, there's never a word start
if (mode != CaretPositioningMode.WordStart && mode != CaretPositioningMode.WordStartOrSymbol) {
// at the document end, there's only a word border
// if the last character is not whitespace
if (mode == CaretPositioningMode.Normal || !char.IsWhiteSpace(textSource.GetCharAt(textLength - 1)))
if (IsNormal(mode) || !char.IsWhiteSpace(textSource.GetCharAt(textLength - 1)))
return nextPos;
}
} else {
@ -320,9 +334,19 @@ namespace ICSharpCode.AvalonEdit.Document @@ -320,9 +334,19 @@ namespace ICSharpCode.AvalonEdit.Document
}
}
static bool IsNormal(CaretPositioningMode mode)
{
return mode == CaretPositioningMode.Normal || mode == CaretPositioningMode.EveryCodepoint;
}
static bool StopBetweenCharacters(CaretPositioningMode mode, CharacterClass charBefore, CharacterClass charAfter)
{
// Stop after every character in normal mode
if (mode == CaretPositioningMode.EveryCodepoint)
return true;
// Don't stop in the middle of a grapheme
if (charAfter == CharacterClass.CombiningMark)
return false;
// Stop after every grapheme in normal mode
if (mode == CaretPositioningMode.Normal)
return true;
if (charBefore == charAfter) {
@ -370,6 +394,11 @@ namespace ICSharpCode.AvalonEdit.Document @@ -370,6 +394,11 @@ namespace ICSharpCode.AvalonEdit.Document
/// <summary>
/// The character is line terminator (\r or \n).
/// </summary>
LineTerminator
LineTerminator,
/// <summary>
/// The character is a unicode combining mark that modifies the previous character.
/// Corresponds to the Unicode designations "Mn", "Mc" and "Me".
/// </summary>
CombiningMark
}
}

200
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretNavigationCommandHandler.cs

@ -15,6 +15,24 @@ using ICSharpCode.AvalonEdit.Utils; @@ -15,6 +15,24 @@ using ICSharpCode.AvalonEdit.Utils;
namespace ICSharpCode.AvalonEdit.Editing
{
enum CaretMovementType
{
None,
CharLeft,
CharRight,
Backspace,
WordLeft,
WordRight,
LineUp,
LineDown,
PageUp,
PageDown,
LineStart,
LineEnd,
DocumentStart,
DocumentEnd
}
static class CaretNavigationCommandHandler
{
/// <summary>
@ -102,22 +120,6 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -102,22 +120,6 @@ namespace ICSharpCode.AvalonEdit.Editing
return target as TextArea;
}
enum CaretMovementType
{
CharLeft,
CharRight,
WordLeft,
WordRight,
LineUp,
LineDown,
PageUp,
PageDown,
LineStart,
LineEnd,
DocumentStart,
DocumentEnd
}
static ExecutedRoutedEventHandler OnMoveCaret(CaretMovementType direction)
{
return (target, args) => {
@ -140,8 +142,7 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -140,8 +142,7 @@ namespace ICSharpCode.AvalonEdit.Editing
TextViewPosition oldPosition = textArea.Caret.Position;
MoveCaret(textArea, direction);
textArea.Selection = textArea.Selection.StartSelectionOrSetEndpoint(oldPosition, textArea.Caret.Position);
if (!textArea.Document.IsInUpdate) // if we're inside a larger update (e.g. called by EditingCommandHandler.OnDelete()), avoid calculating the caret rectangle now
textArea.Caret.BringCaretToView();
textArea.Caret.BringCaretToView();
}
};
}
@ -172,43 +173,55 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -172,43 +173,55 @@ namespace ICSharpCode.AvalonEdit.Editing
}
#region Caret movement
static void MoveCaret(TextArea textArea, CaretMovementType direction)
internal static void MoveCaret(TextArea textArea, CaretMovementType direction)
{
DocumentLine caretLine = textArea.Document.GetLineByNumber(textArea.Caret.Line);
VisualLine visualLine = textArea.TextView.GetOrConstructVisualLine(caretLine);
TextViewPosition caretPosition = textArea.Caret.Position;
double desiredXPos = textArea.Caret.DesiredXPos;
textArea.Caret.Position = GetNewCaretPosition(textArea.TextView, textArea.Caret.Position, direction, textArea.Selection.EnableVirtualSpace, ref desiredXPos);
textArea.Caret.DesiredXPos = desiredXPos;
}
internal static TextViewPosition GetNewCaretPosition(TextView textView, TextViewPosition caretPosition, CaretMovementType direction, bool enableVirtualSpace, ref double desiredXPos)
{
switch (direction) {
case CaretMovementType.None:
return caretPosition;
case CaretMovementType.DocumentStart:
desiredXPos = double.NaN;
return new TextViewPosition(0, 0);
case CaretMovementType.DocumentEnd:
desiredXPos = double.NaN;
return new TextViewPosition(textView.Document.GetLocation(textView.Document.TextLength));
}
DocumentLine caretLine = textView.Document.GetLineByNumber(caretPosition.Line);
VisualLine visualLine = textView.GetOrConstructVisualLine(caretLine);
TextLine textLine = visualLine.GetTextLine(caretPosition.VisualColumn, caretPosition.IsAtEndOfLine);
switch (direction) {
case CaretMovementType.CharLeft:
MoveCaretLeft(textArea, caretPosition, visualLine, CaretPositioningMode.Normal);
break;
desiredXPos = double.NaN;
return GetPrevCaretPosition(textView, caretPosition, visualLine, CaretPositioningMode.Normal, enableVirtualSpace);
case CaretMovementType.Backspace:
desiredXPos = double.NaN;
return GetPrevCaretPosition(textView, caretPosition, visualLine, CaretPositioningMode.EveryCodepoint, enableVirtualSpace);
case CaretMovementType.CharRight:
MoveCaretRight(textArea, caretPosition, visualLine, CaretPositioningMode.Normal);
break;
desiredXPos = double.NaN;
return GetNextCaretPosition(textView, caretPosition, visualLine, CaretPositioningMode.Normal, enableVirtualSpace);
case CaretMovementType.WordLeft:
MoveCaretLeft(textArea, caretPosition, visualLine, CaretPositioningMode.WordStart);
break;
desiredXPos = double.NaN;
return GetPrevCaretPosition(textView, caretPosition, visualLine, CaretPositioningMode.WordStart, enableVirtualSpace);
case CaretMovementType.WordRight:
MoveCaretRight(textArea, caretPosition, visualLine, CaretPositioningMode.WordStart);
break;
desiredXPos = double.NaN;
return GetNextCaretPosition(textView, caretPosition, visualLine, CaretPositioningMode.WordStart, enableVirtualSpace);
case CaretMovementType.LineUp:
case CaretMovementType.LineDown:
case CaretMovementType.PageUp:
case CaretMovementType.PageDown:
MoveCaretUpDown(textArea, direction, visualLine, textLine, caretPosition.VisualColumn);
break;
case CaretMovementType.DocumentStart:
SetCaretPosition(textArea, 0, 0);
break;
case CaretMovementType.DocumentEnd:
SetCaretPosition(textArea, -1, textArea.Document.TextLength);
break;
return GetUpDownCaretPosition(textView, caretPosition, direction, visualLine, textLine, enableVirtualSpace, ref desiredXPos);
case CaretMovementType.LineStart:
MoveCaretToStartOfLine(textArea, visualLine, textLine);
break;
desiredXPos = double.NaN;
return GetStartOfLineCaretPosition(caretPosition.VisualColumn, visualLine, textLine, enableVirtualSpace);
case CaretMovementType.LineEnd:
MoveCaretToEndOfLine(textArea, visualLine, textLine);
break;
desiredXPos = double.NaN;
return GetEndOfLineCaretPosition(visualLine, textLine);
default:
throw new NotSupportedException(direction.ToString());
}
@ -216,81 +229,80 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -216,81 +229,80 @@ namespace ICSharpCode.AvalonEdit.Editing
#endregion
#region Home/End
static void MoveCaretToStartOfLine(TextArea textArea, VisualLine visualLine, TextLine textLine)
static TextViewPosition GetStartOfLineCaretPosition(int oldVC, VisualLine visualLine, TextLine textLine, bool enableVirtualSpace)
{
int newVC = visualLine.GetTextLineVisualStartColumn(textLine);
if (newVC == 0)
newVC = visualLine.GetNextCaretPosition(newVC - 1, LogicalDirection.Forward, CaretPositioningMode.WordStart, textArea.Selection.EnableVirtualSpace);
newVC = visualLine.GetNextCaretPosition(newVC - 1, LogicalDirection.Forward, CaretPositioningMode.WordStart, enableVirtualSpace);
if (newVC < 0)
throw ThrowUtil.NoValidCaretPosition();
// when the caret is already at the start of the text, jump to start before whitespace
if (newVC == textArea.Caret.VisualColumn)
if (newVC == oldVC)
newVC = 0;
int offset = visualLine.FirstDocumentLine.Offset + visualLine.GetRelativeOffset(newVC);
SetCaretPosition(textArea, newVC, offset);
return visualLine.GetTextViewPosition(newVC);
}
static void MoveCaretToEndOfLine(TextArea textArea, VisualLine visualLine, TextLine textLine)
static TextViewPosition GetEndOfLineCaretPosition(VisualLine visualLine, TextLine textLine)
{
int newVC = visualLine.GetTextLineVisualStartColumn(textLine) + textLine.Length - textLine.TrailingWhitespaceLength;
int offset = visualLine.FirstDocumentLine.Offset + visualLine.GetRelativeOffset(newVC);
SetCaretPosition(textArea, newVC, offset, isAtEndOfLine: true);
TextViewPosition pos = visualLine.GetTextViewPosition(newVC);
pos.IsAtEndOfLine = true;
return pos;
}
#endregion
#region By-character / By-word movement
static void MoveCaretRight(TextArea textArea, TextViewPosition caretPosition, VisualLine visualLine, CaretPositioningMode mode)
static TextViewPosition GetNextCaretPosition(TextView textView, TextViewPosition caretPosition, VisualLine visualLine, CaretPositioningMode mode, bool enableVirtualSpace)
{
int pos = visualLine.GetNextCaretPosition(caretPosition.VisualColumn, LogicalDirection.Forward, mode, textArea.Selection.EnableVirtualSpace);
int pos = visualLine.GetNextCaretPosition(caretPosition.VisualColumn, LogicalDirection.Forward, mode, enableVirtualSpace);
if (pos >= 0) {
SetCaretPosition(textArea, pos, visualLine.GetRelativeOffset(pos) + visualLine.FirstDocumentLine.Offset);
return visualLine.GetTextViewPosition(pos);
} else {
// move to start of next line
DocumentLine nextDocumentLine = visualLine.LastDocumentLine.NextLine;
if (nextDocumentLine != null) {
VisualLine nextLine = textArea.TextView.GetOrConstructVisualLine(nextDocumentLine);
pos = nextLine.GetNextCaretPosition(-1, LogicalDirection.Forward, mode, textArea.Selection.EnableVirtualSpace);
VisualLine nextLine = textView.GetOrConstructVisualLine(nextDocumentLine);
pos = nextLine.GetNextCaretPosition(-1, LogicalDirection.Forward, mode, enableVirtualSpace);
if (pos < 0)
throw ThrowUtil.NoValidCaretPosition();
SetCaretPosition(textArea, pos, nextLine.GetRelativeOffset(pos) + nextLine.FirstDocumentLine.Offset);
return nextLine.GetTextViewPosition(pos);
} else {
// at end of document
Debug.Assert(visualLine.LastDocumentLine.Offset + visualLine.LastDocumentLine.TotalLength == textArea.Document.TextLength);
SetCaretPosition(textArea, -1, textArea.Document.TextLength);
Debug.Assert(visualLine.LastDocumentLine.Offset + visualLine.LastDocumentLine.TotalLength == textView.Document.TextLength);
return new TextViewPosition(textView.Document.GetLocation(textView.Document.TextLength));
}
}
}
static void MoveCaretLeft(TextArea textArea, TextViewPosition caretPosition, VisualLine visualLine, CaretPositioningMode mode)
static TextViewPosition GetPrevCaretPosition(TextView textView, TextViewPosition caretPosition, VisualLine visualLine, CaretPositioningMode mode, bool enableVirtualSpace)
{
int pos = visualLine.GetNextCaretPosition(caretPosition.VisualColumn, LogicalDirection.Backward, mode, textArea.Selection.EnableVirtualSpace);
int pos = visualLine.GetNextCaretPosition(caretPosition.VisualColumn, LogicalDirection.Backward, mode, enableVirtualSpace);
if (pos >= 0) {
SetCaretPosition(textArea, pos, visualLine.GetRelativeOffset(pos) + visualLine.FirstDocumentLine.Offset);
return visualLine.GetTextViewPosition(pos);
} else {
// move to end of previous line
DocumentLine previousDocumentLine = visualLine.FirstDocumentLine.PreviousLine;
if (previousDocumentLine != null) {
VisualLine previousLine = textArea.TextView.GetOrConstructVisualLine(previousDocumentLine);
pos = previousLine.GetNextCaretPosition(previousLine.VisualLength + 1, LogicalDirection.Backward, mode, textArea.Selection.EnableVirtualSpace);
VisualLine previousLine = textView.GetOrConstructVisualLine(previousDocumentLine);
pos = previousLine.GetNextCaretPosition(previousLine.VisualLength + 1, LogicalDirection.Backward, mode, enableVirtualSpace);
if (pos < 0)
throw ThrowUtil.NoValidCaretPosition();
SetCaretPosition(textArea, pos, previousLine.GetRelativeOffset(pos) + previousLine.FirstDocumentLine.Offset);
return previousLine.GetTextViewPosition(pos);
} else {
// at start of document
Debug.Assert(visualLine.FirstDocumentLine.Offset == 0);
SetCaretPosition(textArea, 0, 0);
return new TextViewPosition(0, 0);
}
}
}
#endregion
#region Line+Page up/down
static void MoveCaretUpDown(TextArea textArea, CaretMovementType direction, VisualLine visualLine, TextLine textLine, int caretVisualColumn)
static TextViewPosition GetUpDownCaretPosition(TextView textView, TextViewPosition caretPosition, CaretMovementType direction, VisualLine visualLine, TextLine textLine, bool enableVirtualSpace, ref double xPos)
{
// moving up/down happens using the desired visual X position
double xPos = textArea.Caret.DesiredXPos;
if (double.IsNaN(xPos))
xPos = visualLine.GetTextLineVisualXPosition(textLine, caretVisualColumn);
xPos = visualLine.GetTextLineVisualXPosition(textLine, caretPosition.VisualColumn);
// now find the TextLine+VisualLine where the caret will end up in
VisualLine targetVisualLine = visualLine;
TextLine targetLine;
@ -304,8 +316,8 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -304,8 +316,8 @@ namespace ICSharpCode.AvalonEdit.Editing
if (textLineIndex > 0) {
targetLine = visualLine.TextLines[textLineIndex - 1];
} else if (prevLineNumber >= 1) {
DocumentLine prevLine = textArea.Document.GetLineByNumber(prevLineNumber);
targetVisualLine = textArea.TextView.GetOrConstructVisualLine(prevLine);
DocumentLine prevLine = textView.Document.GetLineByNumber(prevLineNumber);
targetVisualLine = textView.GetOrConstructVisualLine(prevLine);
targetLine = targetVisualLine.TextLines[targetVisualLine.TextLines.Count - 1];
} else {
targetLine = null;
@ -319,9 +331,9 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -319,9 +331,9 @@ namespace ICSharpCode.AvalonEdit.Editing
int nextLineNumber = visualLine.LastDocumentLine.LineNumber + 1;
if (textLineIndex < visualLine.TextLines.Count - 1) {
targetLine = visualLine.TextLines[textLineIndex + 1];
} else if (nextLineNumber <= textArea.Document.LineCount) {
DocumentLine nextLine = textArea.Document.GetLineByNumber(nextLineNumber);
targetVisualLine = textArea.TextView.GetOrConstructVisualLine(nextLine);
} else if (nextLineNumber <= textView.Document.LineCount) {
DocumentLine nextLine = textView.Document.GetLineByNumber(nextLineNumber);
targetVisualLine = textView.GetOrConstructVisualLine(nextLine);
targetLine = targetVisualLine.TextLines[0];
} else {
targetLine = null;
@ -334,11 +346,11 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -334,11 +346,11 @@ namespace ICSharpCode.AvalonEdit.Editing
// Page up/down: find the target line using its visual position
double yPos = visualLine.GetTextLineVisualYPosition(textLine, VisualYPosition.LineMiddle);
if (direction == CaretMovementType.PageUp)
yPos -= textArea.TextView.RenderSize.Height;
yPos -= textView.RenderSize.Height;
else
yPos += textArea.TextView.RenderSize.Height;
DocumentLine newLine = textArea.TextView.GetDocumentLineByVisualTop(yPos);
targetVisualLine = textArea.TextView.GetOrConstructVisualLine(newLine);
yPos += textView.RenderSize.Height;
DocumentLine newLine = textView.GetDocumentLineByVisualTop(yPos);
targetVisualLine = textView.GetOrConstructVisualLine(newLine);
targetLine = targetVisualLine.GetTextLineByVisualYPosition(yPos);
break;
}
@ -347,30 +359,18 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -347,30 +359,18 @@ namespace ICSharpCode.AvalonEdit.Editing
}
if (targetLine != null) {
double yPos = targetVisualLine.GetTextLineVisualYPosition(targetLine, VisualYPosition.LineMiddle);
int newVisualColumn = targetVisualLine.GetVisualColumn(new Point(xPos, yPos), textArea.Selection.EnableVirtualSpace);
SetCaretPosition(textArea, targetVisualLine, targetLine, newVisualColumn, false);
textArea.Caret.DesiredXPos = xPos;
}
}
#endregion
#region SetCaretPosition
static void SetCaretPosition(TextArea textArea, VisualLine targetVisualLine, TextLine targetLine,
int newVisualColumn, bool allowWrapToNextLine)
{
int targetLineStartCol = targetVisualLine.GetTextLineVisualStartColumn(targetLine);
if (!allowWrapToNextLine && newVisualColumn >= targetLineStartCol + targetLine.Length) {
if (newVisualColumn <= targetVisualLine.VisualLength)
newVisualColumn = targetLineStartCol + targetLine.Length - 1;
int newVisualColumn = targetVisualLine.GetVisualColumn(new Point(xPos, yPos), enableVirtualSpace);
// prevent wrapping to the next line; TODO: could 'IsAtEnd' help here?
int targetLineStartCol = targetVisualLine.GetTextLineVisualStartColumn(targetLine);
if (newVisualColumn >= targetLineStartCol + targetLine.Length) {
if (newVisualColumn <= targetVisualLine.VisualLength)
newVisualColumn = targetLineStartCol + targetLine.Length - 1;
}
return targetVisualLine.GetTextViewPosition(newVisualColumn);
} else {
return caretPosition;
}
int newOffset = targetVisualLine.GetRelativeOffset(newVisualColumn) + targetVisualLine.FirstDocumentLine.Offset;
SetCaretPosition(textArea, newVisualColumn, newOffset);
}
static void SetCaretPosition(TextArea textArea, int newVisualColumn, int newOffset, bool isAtEndOfLine = false)
{
textArea.Caret.Position = new TextViewPosition(textArea.Document.GetLocation(newOffset), newVisualColumn) { IsAtEndOfLine = isAtEndOfLine };
textArea.Caret.DesiredXPos = double.NaN;
}
#endregion
}

48
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/EditingCommandHandler.cs

@ -46,12 +46,12 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -46,12 +46,12 @@ namespace ICSharpCode.AvalonEdit.Editing
static EditingCommandHandler()
{
CommandBindings.Add(new CommandBinding(ApplicationCommands.Delete, OnDelete(ApplicationCommands.NotACommand), CanDelete));
AddBinding(EditingCommands.Delete, ModifierKeys.None, Key.Delete, OnDelete(EditingCommands.SelectRightByCharacter));
AddBinding(EditingCommands.DeleteNextWord, ModifierKeys.Control, Key.Delete, OnDelete(EditingCommands.SelectRightByWord));
AddBinding(EditingCommands.Backspace, ModifierKeys.None, Key.Back, OnDelete(EditingCommands.SelectLeftByCharacter));
CommandBindings.Add(new CommandBinding(ApplicationCommands.Delete, OnDelete(CaretMovementType.None), CanDelete));
AddBinding(EditingCommands.Delete, ModifierKeys.None, Key.Delete, OnDelete(CaretMovementType.CharRight));
AddBinding(EditingCommands.DeleteNextWord, ModifierKeys.Control, Key.Delete, OnDelete(CaretMovementType.WordRight));
AddBinding(EditingCommands.Backspace, ModifierKeys.None, Key.Back, OnDelete(CaretMovementType.Backspace));
InputBindings.Add(TextAreaDefaultInputHandler.CreateFrozenKeyBinding(EditingCommands.Backspace, ModifierKeys.Shift, Key.Back)); // make Shift-Backspace do the same as plain backspace
AddBinding(EditingCommands.DeletePreviousWord, ModifierKeys.Control, Key.Back, OnDelete(EditingCommands.SelectLeftByWord));
AddBinding(EditingCommands.DeletePreviousWord, ModifierKeys.Control, Key.Back, OnDelete(CaretMovementType.WordLeft));
AddBinding(EditingCommands.EnterParagraphBreak, ModifierKeys.None, Key.Enter, OnEnter);
AddBinding(EditingCommands.EnterLineBreak, ModifierKeys.Shift, Key.Enter, OnEnter);
AddBinding(EditingCommands.TabForward, ModifierKeys.None, Key.Tab, OnTab);
@ -225,34 +225,24 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -225,34 +225,24 @@ namespace ICSharpCode.AvalonEdit.Editing
#endregion
#region Delete
static ExecutedRoutedEventHandler OnDelete(RoutedUICommand selectingCommand)
static ExecutedRoutedEventHandler OnDelete(CaretMovementType caretMovement)
{
return (target, args) => {
TextArea textArea = GetTextArea(target);
if (textArea != null && textArea.Document != null) {
// call BeginUpdate before running the 'selectingCommand'
// so that undoing the delete does not select the deleted character
using (textArea.Document.RunUpdate()) {
if (textArea.Selection.IsEmpty) {
TextViewPosition oldCaretPosition = textArea.Caret.Position;
if (textArea.Caret.IsInVirtualSpace && selectingCommand == EditingCommands.SelectRightByCharacter)
EditingCommands.SelectRightByWord.Execute(args.Parameter, textArea);
else
selectingCommand.Execute(args.Parameter, textArea);
bool hasSomethingDeletable = false;
foreach (ISegment s in textArea.Selection.Segments) {
if (textArea.GetDeletableSegments(s).Length > 0) {
hasSomethingDeletable = true;
break;
}
}
if (!hasSomethingDeletable) {
// If nothing in the selection is deletable; then reset caret+selection
// to the previous value. This prevents the caret from moving through read-only sections.
textArea.Caret.Position = oldCaretPosition;
textArea.ClearSelection();
}
}
if (textArea.Selection.IsEmpty) {
TextViewPosition startPos = textArea.Caret.Position;
bool enableVirtualSpace = textArea.Options.EnableVirtualSpace;
// When pressing delete; don't move the caret further into virtual space - instead delete the newline
if (caretMovement == CaretMovementType.CharRight)
enableVirtualSpace = false;
double desiredXPos = textArea.Caret.DesiredXPos;
TextViewPosition endPos = CaretNavigationCommandHandler.GetNewCaretPosition(
textArea.TextView, startPos, caretMovement, enableVirtualSpace, ref desiredXPos);
// Don't select the text to be deleted; just reuse the ReplaceSelectionWithText logic
var sel = new SimpleSelection(textArea, startPos, endPos);
sel.ReplaceSelectionWithText(string.Empty);
} else {
textArea.RemoveSelectedText();
}
textArea.Caret.BringCaretToView();

16
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/SimpleSelection.cs

@ -55,10 +55,16 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -55,10 +55,16 @@ namespace ICSharpCode.AvalonEdit.Editing
if (segmentsToDelete[i].Offset == SurroundingSegment.Offset && segmentsToDelete[i].Length == SurroundingSegment.Length) {
newText = AddSpacesIfRequired(newText, start, end);
}
int vc = textArea.Caret.VisualColumn;
textArea.Caret.Offset = segmentsToDelete[i].EndOffset;
if (string.IsNullOrEmpty(newText))
textArea.Caret.VisualColumn = vc;
if (string.IsNullOrEmpty(newText)) {
// place caret at the beginning of the selection
if (start.CompareTo(end) <= 0)
textArea.Caret.Position = start;
else
textArea.Caret.Position = end;
} else {
// place caret so that it ends up behind the new text
textArea.Caret.Offset = segmentsToDelete[i].EndOffset;
}
textArea.Document.Replace(segmentsToDelete[i], newText);
} else {
textArea.Document.Remove(segmentsToDelete[i]);
@ -100,7 +106,7 @@ namespace ICSharpCode.AvalonEdit.Editing @@ -100,7 +106,7 @@ namespace ICSharpCode.AvalonEdit.Editing
/// <inheritdoc/>
public override bool IsEmpty {
get { return startOffset == endOffset; }
get { return startOffset == endOffset && start.VisualColumn == end.VisualColumn; }
}
/// <inheritdoc/>

4
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/SingleCharacterElementGenerator.cs

@ -111,7 +111,7 @@ namespace ICSharpCode.AvalonEdit.Rendering @@ -111,7 +111,7 @@ namespace ICSharpCode.AvalonEdit.Rendering
public override int GetNextCaretPosition(int visualColumn, LogicalDirection direction, CaretPositioningMode mode)
{
if (mode == CaretPositioningMode.Normal)
if (mode == CaretPositioningMode.Normal || mode == CaretPositioningMode.EveryCodepoint)
return base.GetNextCaretPosition(visualColumn, direction, mode);
else
return -1;
@ -146,7 +146,7 @@ namespace ICSharpCode.AvalonEdit.Rendering @@ -146,7 +146,7 @@ namespace ICSharpCode.AvalonEdit.Rendering
public override int GetNextCaretPosition(int visualColumn, LogicalDirection direction, CaretPositioningMode mode)
{
if (mode == CaretPositioningMode.Normal)
if (mode == CaretPositioningMode.Normal || mode == CaretPositioningMode.EveryCodepoint)
return base.GetNextCaretPosition(visualColumn, direction, mode);
else
return -1;

13
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLine.cs

@ -548,6 +548,15 @@ namespace ICSharpCode.AvalonEdit.Rendering @@ -548,6 +548,15 @@ namespace ICSharpCode.AvalonEdit.Rendering
return ch.FirstCharacterIndex;
}
/// <summary>
/// Gets the text view position from the specified visual column.
/// </summary>
public TextViewPosition GetTextViewPosition(int visualColumn)
{
int documentOffset = GetRelativeOffset(visualColumn) + this.FirstDocumentLine.Offset;
return new TextViewPosition(this.Document.GetLocation(documentOffset), visualColumn);
}
/// <summary>
/// Gets the text view position from the specified visual position.
/// If the position is within a character, it is rounded to the next character boundary.
@ -690,12 +699,12 @@ namespace ICSharpCode.AvalonEdit.Rendering @@ -690,12 +699,12 @@ namespace ICSharpCode.AvalonEdit.Rendering
static bool HasStopsInVirtualSpace(CaretPositioningMode mode)
{
return mode == CaretPositioningMode.Normal;
return mode == CaretPositioningMode.Normal || mode == CaretPositioningMode.EveryCodepoint;
}
static bool HasImplicitStopAtLineStart(CaretPositioningMode mode)
{
return mode == CaretPositioningMode.Normal;
return mode == CaretPositioningMode.Normal || mode == CaretPositioningMode.EveryCodepoint;
}
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "mode",

11
src/Libraries/SharpTreeView/ICSharpCode.TreeView/SharpTreeView.cs

@ -239,11 +239,20 @@ namespace ICSharpCode.TreeView @@ -239,11 +239,20 @@ namespace ICSharpCode.TreeView
}
break;
case Key.Return:
case Key.Space:
if (container != null && Keyboard.Modifiers == ModifierKeys.None && this.SelectedItems.Count == 1 && this.SelectedItem == container.Node) {
container.Node.ActivateItem(e);
}
break;
case Key.Space:
if (container != null && Keyboard.Modifiers == ModifierKeys.None && this.SelectedItems.Count == 1 && this.SelectedItem == container.Node) {
if(container.Node.IsCheckable) {
if(container.Node.IsChecked == null) // If partially selected, we want to select everything
container.Node.IsChecked = true;
else
container.Node.IsChecked = !container.Node.IsChecked;
}
}
break;
case Key.Add:
if (container != null && ItemsControl.ItemsControlFromItemContainer(container) == this) {
container.Node.IsExpanded = true;

15
src/Main/Base/Project/Dom/ClassBrowser/AssemblyTreeNode.cs

@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using ICSharpCode.Core.Presentation;
using ICSharpCode.TreeView;
namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
@ -43,7 +44,19 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -43,7 +44,19 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
public override object Icon {
get {
return base.Icon;
if (model.Context.IsValid) {
return SD.ResourceService.GetImageSource("Icons.16x16.Assembly");
} else {
return SD.ResourceService.GetImageSource("Icons.16x16.AssemblyError");
}
}
}
public override void ShowContextMenu()
{
var assemblyModel = this.Model as IAssemblyModel;
if (assemblyModel != null) {
var ctx = MenuService.ShowContextMenu(null, assemblyModel, "/SharpDevelop/Pads/ClassBrowser/AssemblyContextMenu");
}
}
}

27
src/Main/Base/Project/Dom/ClassBrowser/TypeDefinitionTreeNode.cs

@ -5,12 +5,14 @@ using System; @@ -5,12 +5,14 @@ using System;
using System.Collections.Generic;
using ICSharpCode.Core.Presentation;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory.Utils;
using ICSharpCode.TreeView;
namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
{
public class TypeDefinitionTreeNode : ModelCollectionTreeNode
{
static readonly IComparer<SharpTreeNode> TypeMemberNodeComparer = new TypeDefinitionMemberNodeComparer();
ITypeDefinitionModel definition;
public TypeDefinitionTreeNode(ITypeDefinitionModel definition)
@ -40,7 +42,7 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -40,7 +42,7 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
protected override IComparer<SharpTreeNode> NodeComparer {
get {
return NodeTextComparer;
return TypeMemberNodeComparer;
}
}
@ -64,6 +66,29 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -64,6 +66,29 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
var ctx = MenuService.ShowContextMenu(null, entityModel, "/SharpDevelop/EntityContextMenu");
}
}
class TypeDefinitionMemberNodeComparer : IComparer<SharpTreeNode>
{
public int Compare(SharpTreeNode x, SharpTreeNode y)
{
var a = x.Model as IMemberModel;
var b = y.Model as IMemberModel;
if (a == null && b == null)
return NodeTextComparer.Compare(x, y);
if (a == null)
return -1;
if (b == null)
return 1;
if (a.SymbolKind < b.SymbolKind)
return -1;
if (a.SymbolKind > b.SymbolKind)
return 1;
return NodeTextComparer.Compare(x, y);
}
}
}
}

27
src/Main/Base/Project/Dom/ClassBrowser/WorkspaceTreeNode.cs

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using ICSharpCode.NRefactory.Utils;
using ICSharpCode.TreeView;
namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
@ -13,7 +14,25 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -13,7 +14,25 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
/// </summary>
public class WorkspaceTreeNode : ModelCollectionTreeNode
{
class WorkspaceChildComparer : IComparer<SharpTreeNode>
{
IComparer<string> stringComparer = StringComparer.OrdinalIgnoreCase;
public int Compare(SharpTreeNode x, SharpTreeNode y)
{
// Solution node has precedence over other nodes
if ((x is SolutionTreeNode) && !(y is SolutionTreeNode))
return -1;
if (!(x is SolutionTreeNode) && (y is SolutionTreeNode))
return 1;
// Both nodes are solutions or not solutions, compare their Text property
return stringComparer.Compare(x.Text.ToString(), y.Text.ToString());
}
}
WorkspaceModel workspace;
protected static readonly IComparer<SharpTreeNode> ChildNodeComparer = new WorkspaceChildComparer();
public IMutableModelCollection<SharpTreeNode> SpecialNodes {
get { return workspace.SpecialNodes; }
@ -40,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -40,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
}
protected override IComparer<SharpTreeNode> NodeComparer {
get { return NodeTextComparer; }
get { return ChildNodeComparer; }
}
public override object Text {
@ -51,7 +70,7 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -51,7 +70,7 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
public override object Icon {
get {
return SD.ResourceService.GetImageSource("PadIcons.ClassBrowser");
return SD.ResourceService.GetImageSource("Icons.16x16.Workspace");
}
}
@ -62,7 +81,9 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -62,7 +81,9 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
protected override void InsertSpecialNodes()
{
Children.AddRange(workspace.SpecialNodes);
foreach (var node in workspace.SpecialNodes) {
Children.OrderedInsert(node, ChildNodeComparer);
}
}
void SpecialNodesModelCollectionChanged(IReadOnlyCollection<SharpTreeNode> removedItems, IReadOnlyCollection<SharpTreeNode> addedItems)

11
src/Main/Base/Project/Dom/IAssemblyModel.cs

@ -42,6 +42,11 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -42,6 +42,11 @@ namespace ICSharpCode.SharpDevelop.Dom
/// This always is the namespace without a name - it's unrelated to the 'root namespace' project setting.
/// </remarks>
INamespaceModel RootNamespace { get; }
/// <summary>
/// Gets the <see cref="IEntityModelContext"/> of this assembly model.
/// </summary>
IEntityModelContext Context { get; }
}
/// <summary>
@ -92,6 +97,12 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -92,6 +97,12 @@ namespace ICSharpCode.SharpDevelop.Dom
public INamespaceModel RootNamespace {
get { return EmptyNamespaceModel.Instance; }
}
public IEntityModelContext Context {
get {
return null;
}
}
}
}

31
src/Main/Base/Project/Dom/IEntityModelContext.cs

@ -34,6 +34,21 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -34,6 +34,21 @@ namespace ICSharpCode.SharpDevelop.Dom
/// Returns true if part1 is considered a better candidate for the primary part than part2.
/// </summary>
bool IsBetterPart(IUnresolvedTypeDefinition part1, IUnresolvedTypeDefinition part2);
/// <summary>
/// Short name of current assembly.
/// </summary>
string AssemblyName { get; }
/// <summary>
/// Full path and file name of the assembly. Output assembly for projects.
/// </summary>
string Location { get; }
/// <summary>
/// Returns whether this is a valid context (based on a existing and readable definition).
/// </summary>
bool IsValid { get; }
}
public class ProjectEntityModelContext : IEntityModelContext
@ -53,6 +68,10 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -53,6 +68,10 @@ namespace ICSharpCode.SharpDevelop.Dom
get { return project.AssemblyName; }
}
public string Location {
get { return project.OutputAssemblyFullPath; }
}
public IProject Project {
get { return project; }
}
@ -66,6 +85,10 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -66,6 +85,10 @@ namespace ICSharpCode.SharpDevelop.Dom
{
return EntityModelContextUtils.IsBetterPart(part1, part2, primaryCodeFileExtension);
}
public bool IsValid {
get { return true; }
}
}
public class AssemblyEntityModelContext : IEntityModelContext
@ -88,6 +111,10 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -88,6 +111,10 @@ namespace ICSharpCode.SharpDevelop.Dom
get { return mainAssembly.AssemblyName; }
}
public string Location {
get { return mainAssembly.Location; }
}
public ICompilation GetCompilation()
{
return compilation;
@ -101,6 +128,10 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -101,6 +128,10 @@ namespace ICSharpCode.SharpDevelop.Dom
public IProject Project {
get { return null; }
}
public bool IsValid {
get { return true; }
}
}
public static class EntityModelContextUtils

10
src/Main/Base/Project/Editor/Bookmarks/BookmarkPad.cs

@ -69,6 +69,16 @@ namespace ICSharpCode.SharpDevelop.Editor.Bookmarks @@ -69,6 +69,16 @@ namespace ICSharpCode.SharpDevelop.Editor.Bookmarks
if (bm != null)
OnItemActivated(bm);
};
this.control.listView.KeyDown += delegate(object sender, System.Windows.Input.KeyEventArgs e) {
SDBookmark bm = this.control.listView.SelectedItem as SDBookmark;
if (bm == null) return;
switch (e.Key) {
case System.Windows.Input.Key.Delete:
SD.BookmarkManager.RemoveMark(bm);
break;
}
};
}
public override void Dispose()

110
src/Main/Base/Project/Editor/CodeCompletion/SnippetCompletionData.cs

@ -0,0 +1,110 @@ @@ -0,0 +1,110 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Completion;
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion
{
/// <summary>
/// Code completion data for snippets.
/// </summary>
public class SnippetCompletionData : IFancyCompletionItem, ISnippetCompletionItem, ICompletionData, ICompletionItem
{
#region ICompletionData implementation
void ICompletionData.AddOverload(ICompletionData data) { }
CompletionCategory category;
CompletionCategory ICompletionData.CompletionCategory {
get { return category; }
set { category = value; }
}
string ICompletionData.DisplayText {
get { return snippet.Text; }
set { }
}
string ICompletionData.Description {
get { return snippet.Description; }
set { }
}
string ICompletionData.CompletionText {
get { return snippet.Text; }
set { }
}
DisplayFlags displayFlags;
DisplayFlags ICompletionData.DisplayFlags {
get { return displayFlags; }
set { displayFlags = value; }
}
bool ICompletionData.HasOverloads {
get { return false; }
}
System.Collections.Generic.IEnumerable<ICompletionData> ICompletionData.OverloadedData {
get { return EmptyList<ICompletionData>.Instance; }
}
#endregion
ISnippetCompletionItem snippet;
public SnippetCompletionData(ISnippetCompletionItem completionItem)
{
snippet = completionItem;
}
#region ISnippetCompletionItem implementation
public string Keyword {
get { return snippet.Keyword; }
}
#endregion
#region ICompletionItem implementation
public void Complete(CompletionContext context)
{
snippet.Complete(context);
}
public string Text {
get { return snippet.Text; }
}
string ICompletionItem.Description {
get { return snippet.Description; }
}
public ICSharpCode.SharpDevelop.IImage Image {
get { return snippet.Image; }
}
public double Priority {
get { return snippet.Priority; }
}
#endregion
#region IFancyCompletionItem implementation
public object Content {
get { return snippet.Text; }
}
public object Description {
get { return snippet.Description; }
}
#endregion
}
}

9
src/Main/Base/Project/Editor/ITextEditor.cs

@ -13,15 +13,6 @@ using ICSharpCode.SharpDevelop.Refactoring; @@ -13,15 +13,6 @@ using ICSharpCode.SharpDevelop.Refactoring;
namespace ICSharpCode.SharpDevelop.Editor
{
[ViewContentService]
public interface ITextEditorProvider : IFileDocumentProvider
{
[Obsolete("Use viewContent.GetService<ITextEditor>() instead.")]
ITextEditor TextEditor {
get;
}
}
/// <summary>
/// Interface for text editors.
/// </summary>

42
src/Main/Base/Project/ICSharpCode.SharpDevelop.addin

@ -238,7 +238,7 @@ @@ -238,7 +238,7 @@
class = "ICSharpCode.SharpDevelop.Project.Commands.RefreshProjectBrowser"/>
<ToolbarItem id = "PropertySeparator" type = "Separator"/>
<ToolbarItem id = "Collapse"
icon = "Icons.16x16.Assembly"
icon = "Icons.16x16.Collection"
tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
class = "ICSharpCode.SharpDevelop.Project.Commands.CollapseAllProjectBrowser"/>
</Condition>
@ -908,7 +908,7 @@ @@ -908,7 +908,7 @@
<!-- ClassBrowser -->
<Path name = "/SharpDevelop/Pads/ClassBrowser/Toolbar">
<ToolbarItem id = "Back"
<!--<ToolbarItem id = "Back"
icon = "Icons.16x16.BrowserBefore"
tooltip = "${res:MainWindow.Windows.ClassBrowser.BackButton.ToolTip}"
loadclasslazy = "false"
@ -919,12 +919,21 @@ @@ -919,12 +919,21 @@
loadclasslazy = "false"
class = "ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserNavigateForward"/>
<ToolbarItem id = "NavigationSeparator" type = "Separator"/>
<ToolbarItem id = "NavigationSeparator" type = "Separator"/>-->
<ToolbarItem id = "OpenAssembly"
icon = "Icons.16x16.OpenProjectIcon"
tooltip = "${res:MainWindow.Windows.ClassBrowser.OpenAssembly.ToolTip}"
class = "ICSharpCode.SharpDevelop.Dom.ClassBrowser.OpenAssemblyCommand"/>
<ToolbarItem id = "SelectFilter"
type = "DropDownButton"
icon = "Icons.16x16.Assembly"
tooltip = "Open assembly">
<MenuItem id = "OpenAssemblyFromFile"
icon = "Icons.16x16.AssemblyFromFile"
label = "Open assembly from file"
class = "ICSharpCode.SharpDevelop.Dom.ClassBrowser.OpenAssemblyFromFileCommand"/>
<MenuItem id = "OpenAssemblyFromGAC"
icon = "Icons.16x16.AssemblyFromGAC"
label = "Open assembly from GAC"
class = "ICSharpCode.SharpDevelop.Dom.ClassBrowser.OpenAssemblyFromGACCommand"/>
</ToolbarItem>
<!--<ToolbarItem id = "SelectFilter"
type = "DropDownButton"
icon = "Icons.16x16.FindInFiles"
tooltip = "${res:MainWindow.Windows.ClassBrowser.ClassViewSettingsButton.ToolTip}"
@ -957,9 +966,9 @@ @@ -957,9 +966,9 @@
</ToolbarItem>
<ToolbarItem id = "NavigationSeparator" type = "Separator"/>
<ToolbarItem id = "Collapse"
icon = "Icons.16x16.Assembly"
icon = "Icons.16x16.Collection"
tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
class = "ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserCollapseAll"/>
class = "ICSharpCode.SharpDevelop.Dom.ClassBrowser.ClassBrowserCollapseAll"/>-->
</Path>
<Path name = "/SharpDevelop/Pads/ClassBrowser/Searchbar">
@ -979,6 +988,13 @@ @@ -979,6 +988,13 @@
class = "ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserCancelSearch"/>
</Path>
<Path name = "/SharpDevelop/Pads/ClassBrowser/AssemblyContextMenu">
<MenuItem id = "RemoveAssembly"
label = "Remove"
icon = "Icons.16x16.DeleteIcon"
class = "ICSharpCode.SharpDevelop.Dom.ClassBrowser.RemoveAssemblyCommand"/>
</Path>
<!-- end ClassBrowser -->
<!-- toolbars -->
@ -1905,10 +1921,6 @@ @@ -1905,10 +1921,6 @@
shortcut = "Shift|Control|Tab"
class = "ICSharpCode.SharpDevelop.Commands.SelectPrevWindow" />
<MenuItem id ="NxtPrvSeparator" type = "Separator" />
<MenuItem id = "SplitView"
label = "${res:XML.MainMenu.WindowMenu.Split}"
icon = "Icons.16x16.SplitWindow"
command = "ICSharpCode.SharpDevelop.SharpDevelopRoutedCommands.SplitView"/>
<MenuItem id = "CloseAll"
label = "${res:XML.MainMenu.FileMenu.CloseAll}"
icon = "Icons.16x16.CloseAllDocuments"
@ -2182,12 +2194,12 @@ @@ -2182,12 +2194,12 @@
<Path name = "/SharpDevelop/Pads/SearchResultPanel/Toolbar">
<Condition name = "Ownerstate" ownerstate = "DefaultMode" action = "Exclude">
<ToolbarItem id = "ExpandAll"
icon = "Icons.16x16.OpenAssembly"
icon = "Icons.16x16.OpenCollection"
tooltip = "${res:MainWindow.Windows.SearchResultPanel.ExpandAll.ToolTip}"
class = "SearchAndReplace.ExpandAll"/>
<ToolbarItem id = "CollapseAll"
icon = "Icons.16x16.Assembly"
icon = "Icons.16x16.Collection"
tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
class = "SearchAndReplace.CollapseAll"/>
<ToolbarItem id = "ExpandCollapseSeparator" type = "Separator" />

1
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -126,6 +126,7 @@ @@ -126,6 +126,7 @@
<Compile Include="Editor\Bookmarks\IBookmarkMargin.cs" />
<Compile Include="Editor\Bookmarks\SDBookmark.cs" />
<Compile Include="Editor\Bookmarks\SDMarkerBookmark.cs" />
<Compile Include="Editor\CodeCompletion\SnippetCompletionData.cs" />
<Compile Include="Editor\DocumentServiceAttribute.cs" />
<Compile Include="Editor\DocumentUtilities.cs" />
<Compile Include="Editor\IBracketSearcher.cs" />

2
src/Main/Base/Project/Src/Commands/SharpDevelopRoutedCommands.cs

@ -11,7 +11,5 @@ namespace ICSharpCode.SharpDevelop @@ -11,7 +11,5 @@ namespace ICSharpCode.SharpDevelop
/// </summary>
public static class SharpDevelopRoutedCommands
{
public static readonly RoutedCommand SplitView = new RoutedCommand(
"SplitView", typeof(SharpDevelopRoutedCommands));
}
}

1
src/Main/Base/Project/Src/Editor/Dialogs/RenameSymbolDialog.xaml.cs

@ -42,6 +42,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Dialogs @@ -42,6 +42,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Dialogs
// Set focus into TextBox
this.symbolNameTextBox.Focus();
this.IsVisibleChanged += (sender, e) => this.symbolNameTextBox.SelectAll();
}
public string OldSymbolName

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

@ -24,7 +24,7 @@ using ICSharpCode.SharpDevelop.Workbench; @@ -24,7 +24,7 @@ using ICSharpCode.SharpDevelop.Workbench;
namespace ICSharpCode.SharpDevelop.Gui
{
public abstract class AbstractConsolePad : AbstractPadContent, IEditable, IPositionable, ITextEditorProvider, IToolsHost
public abstract class AbstractConsolePad : AbstractPadContent, IEditable, IPositionable, IToolsHost
{
const string toolBarTreePath = "/SharpDevelop/Pads/CommonConsole/ToolBar";

46
src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs

@ -6,7 +6,7 @@ using System.IO; @@ -6,7 +6,7 @@ using System.IO;
using System.Threading.Tasks;
using System.Windows;
using ICSharpCode.AvalonEdit;
using System.Windows.Threading;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.AvalonEdit.Highlighting;
using ICSharpCode.Core;
@ -24,14 +24,13 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -24,14 +24,13 @@ namespace ICSharpCode.SharpDevelop.Gui
public class DefinitionViewPad : AbstractPadContent
{
AvalonEdit.TextEditor ctl;
DispatcherTimer timer;
/// <summary>
/// The control representing the pad
/// </summary>
public override object Control {
get {
return ctl;
}
get { return ctl; }
}
/// <summary>
@ -42,8 +41,11 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -42,8 +41,11 @@ namespace ICSharpCode.SharpDevelop.Gui
ctl = Editor.AvalonEditTextEditorAdapter.CreateAvalonEditInstance();
ctl.IsReadOnly = true;
ctl.MouseDoubleClick += OnDoubleClick;
throw new NotImplementedException();
//ParserService.ParserUpdateStepFinished += OnParserUpdateStep;
SD.ParserService.ParseInformationUpdated += OnParserUpdateStep;
SD.ParserService.LoadSolutionProjectsThread.Finished += LoadThreadFinished;
timer = new DispatcherTimer(DispatcherPriority.Background) { Interval = TimeSpan.FromSeconds(2) };
timer.Tick += delegate { UpdateTick(null); };
timer.IsEnabled = !SD.ParserService.LoadSolutionProjectsThread.IsRunning;
ctl.IsVisibleChanged += delegate { UpdateTick(null); };
}
@ -52,47 +54,55 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -52,47 +54,55 @@ namespace ICSharpCode.SharpDevelop.Gui
/// </summary>
public override void Dispose()
{
//ParserService.ParserUpdateStepFinished -= OnParserUpdateStep;
SD.ParserService.ParseInformationUpdated -= OnParserUpdateStep;
SD.ParserService.LoadSolutionProjectsThread.Finished -= LoadThreadFinished;
ctl.Document = null;
base.Dispose();
}
void OnDoubleClick(object sender, EventArgs e)
{
string fileName = currentFileName;
FileName fileName = currentFileName;
if (fileName != null) {
var caret = ctl.TextArea.Caret;
FileService.JumpToFilePosition(fileName, caret.Line, caret.Column);
SD.FileService.JumpToFilePosition(fileName, caret.Line, caret.Column);
// refresh DefinitionView to show the definition of the expression that was double-clicked
UpdateTick(null);
}
}
void OnParserUpdateStep(object sender, ParserUpdateStepEventArgs e)
void LoadThreadFinished(object sender, EventArgs e)
{
timer.IsEnabled = true;
UpdateTick(null);
}
void OnParserUpdateStep(object sender, ParseInformationEventArgs e)
{
UpdateTick(e);
}
async void UpdateTick(ParserUpdateStepEventArgs e)
async void UpdateTick(ParseInformationEventArgs e)
{
timer.IsEnabled = ctl.IsVisible;
if (!ctl.IsVisible) return;
LoggingService.Debug("DefinitionViewPad.Update");
ResolveResult res = await ResolveAtCaretAsync(e);
if (res == null) return;
var pos = res.GetDefinitionRegion();
if (pos.IsEmpty) return;
if (pos.IsEmpty) return; // TODO : try to decompile?
OpenFile(pos);
}
Task<ResolveResult> ResolveAtCaretAsync(ParserUpdateStepEventArgs e)
Task<ResolveResult> ResolveAtCaretAsync(ParseInformationEventArgs e)
{
IWorkbenchWindow window = SD.Workbench.ActiveWorkbenchWindow;
if (window == null)
if (window == null)
return Task.FromResult<ResolveResult>(null);
IViewContent viewContent = window.ActiveViewContent;
if (viewContent == null)
if (viewContent == null)
return Task.FromResult<ResolveResult>(null);
ITextEditor editor = viewContent.GetService<ITextEditor>();
if (editor == null)
@ -107,14 +117,14 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -107,14 +117,14 @@ namespace ICSharpCode.SharpDevelop.Gui
}
DomRegion oldPosition;
string currentFileName;
FileName currentFileName;
void OpenFile(DomRegion pos)
{
if (pos.Equals(oldPosition)) return;
oldPosition = pos;
if (pos.FileName != currentFileName)
LoadFile(pos.FileName);
LoadFile(new FileName(pos.FileName));
ctl.TextArea.Caret.Location = pos.Begin;
Rect r = ctl.TextArea.Caret.CalculateCaretRectangle();
if (!r.IsEmpty) {
@ -126,7 +136,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -126,7 +136,7 @@ namespace ICSharpCode.SharpDevelop.Gui
/// Loads the file from the corresponding text editor window if it is
/// open otherwise the file is loaded from the file system.
/// </summary>
void LoadFile(string fileName)
void LoadFile(FileName fileName)
{
// Load the text into the definition view's text editor.
ctl.Document = new TextDocument(SD.FileService.GetFileContent(fileName));

6
src/Main/SharpDevelop/Dom/AssemblyModel.cs

@ -50,6 +50,12 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -50,6 +50,12 @@ namespace ICSharpCode.SharpDevelop.Dom
}
}
public IEntityModelContext Context {
get {
return context;
}
}
public void Update(IUnresolvedFile oldFile, IUnresolvedFile newFile)
{
IList<IUnresolvedTypeDefinition> old = EmptyList<IUnresolvedTypeDefinition>.Instance;

207
src/Main/SharpDevelop/Dom/ClassBrowser/ClassBrowserPad.cs

@ -2,17 +2,78 @@ @@ -2,17 +2,78 @@
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.IO;
using System.Linq;
using System.Collections.Generic;
using System.Diagnostics;
using System.Windows.Controls;
using ICSharpCode.Core;
using ICSharpCode.Core.Presentation;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.TreeView;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Workbench;
namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
{
public class PersistedWorkspace
{
public PersistedWorkspace()
{
AssemblyFiles = new List<string>();
}
public string Name { get; set; }
public List<String> AssemblyFiles { get; set; }
public bool IsActive { get; set; }
}
class UnresolvedAssemblyEntityModelContext : IEntityModelContext
{
string assemblyName;
string location;
public UnresolvedAssemblyEntityModelContext(string assemblyName, string location)
{
this.assemblyName = assemblyName;
this.location = location;
}
public ICompilation GetCompilation()
{
return null;
}
public bool IsBetterPart(IUnresolvedTypeDefinition part1, IUnresolvedTypeDefinition part2)
{
return false;
}
public IProject Project {
get {
return null;
}
}
public string AssemblyName {
get {
return assemblyName;
}
}
public string Location {
get {
return location;
}
}
public bool IsValid {
get { return false; }
}
}
class ClassBrowserPad : AbstractPadContent, IClassBrowser
{
#region IClassBrowser implementation
@ -25,13 +86,19 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -25,13 +86,19 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
get { return treeView.AssemblyList; }
set { treeView.AssemblyList = value; }
}
#endregion
const string PersistedWorkspaceSetting = "ClassBrowser.Workspaces";
const string DefaultWorkspaceName = "<default>";
IProjectService projectService;
ClassBrowserTreeView treeView;
DockPanel panel;
ToolBar toolBar;
List<PersistedWorkspace> persistedWorkspaces;
PersistedWorkspace activeWorkspace;
public ClassBrowserPad()
: this(SD.GetRequiredService<IProjectService>())
@ -53,6 +120,9 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -53,6 +120,9 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
//treeView.ContextMenu = CreateContextMenu("/SharpDevelop/Pads/UnitTestsPad/ContextMenu");
projectService.CurrentSolutionChanged += ProjectServiceCurrentSolutionChanged;
ProjectServiceCurrentSolutionChanged(null, null);
// Load workspaces from configuration
LoadWorkspaces();
}
public override void Dispose()
@ -77,6 +147,26 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -77,6 +147,26 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
treeView.SpecialNodes.Add(new SolutionTreeNode(projectService.CurrentSolution));
}
void AssemblyListCollectionChanged(IReadOnlyCollection<IAssemblyModel> removedItems, IReadOnlyCollection<IAssemblyModel> addedItems)
{
foreach (var assembly in addedItems) {
// Add this assembly to current workspace
if (activeWorkspace != null) {
activeWorkspace.AssemblyFiles.Add(assembly.Context.Location);
}
}
foreach (var assembly in removedItems) {
// Add this assembly to current workspace
if (activeWorkspace != null) {
activeWorkspace.AssemblyFiles.Remove(assembly.Context.Location);
}
}
// Update workspace list in configuration
SaveWorkspaces();
}
/// <summary>
/// Virtual method so we can override this method and return
/// a dummy ToolBar when testing.
@ -96,5 +186,120 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -96,5 +186,120 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
Debug.Assert(treeView != null);
return MenuService.CreateContextMenu(treeView, name);
}
/// <summary>
/// Loads persisted workspaces from configuration.
/// </summary>
void LoadWorkspaces()
{
persistedWorkspaces = SD.PropertyService.GetList<PersistedWorkspace>(PersistedWorkspaceSetting).ToList();
if (!persistedWorkspaces.Any())
{
// Add at least default workspace
persistedWorkspaces = new List<PersistedWorkspace>();
persistedWorkspaces.Add(new PersistedWorkspace()
{
Name = DefaultWorkspaceName
});
}
// Load all assemblies (for now always from default workspace)
PersistedWorkspace defaultWorkspace = persistedWorkspaces.FirstOrDefault(w => w.Name == DefaultWorkspaceName);
ActivateWorkspace(defaultWorkspace);
}
/// <summary>
/// Stores currently saved workspaces in configuration.
/// </summary>
void SaveWorkspaces()
{
SD.PropertyService.SetList<PersistedWorkspace>(PersistedWorkspaceSetting, persistedWorkspaces);
}
public static IAssemblyModel CreateAssemblyModelFromFile(string fileName)
{
try {
var loader = new CecilLoader();
loader.IncludeInternalMembers = true;
loader.LazyLoad = true;
var assembly = loader.LoadAssemblyFile(fileName);
IEntityModelContext context = new AssemblyEntityModelContext(assembly);
IAssemblyModel model = SD.GetRequiredService<IModelFactory>().CreateAssemblyModel(context);
if (model is IUpdateableAssemblyModel) {
((IUpdateableAssemblyModel)model).Update(EmptyList<IUnresolvedTypeDefinition>.Instance, assembly.TopLevelTypeDefinitions.ToList());
((IUpdateableAssemblyModel) model).AssemblyName = assembly.AssemblyName;
}
return model;
} catch (BadImageFormatException ex) {
SD.MessageService.ShowWarningFormatted("{0} is not a valid .NET assembly.", Path.GetFileName(fileName));
} catch (FileNotFoundException ex) {
SD.MessageService.ShowWarningFormatted("{0} is not accessible or doesn't exist anymore.", fileName);
}
// AssemblyModel for unresolved file references
IEntityModelContext unresolvedContext = new UnresolvedAssemblyEntityModelContext(Path.GetFileName(fileName), fileName);
IAssemblyModel unresolvedModel = SD.GetRequiredService<IModelFactory>().CreateAssemblyModel(unresolvedContext);
if (unresolvedModel is IUpdateableAssemblyModel) {
((IUpdateableAssemblyModel) unresolvedModel).AssemblyName = unresolvedContext.AssemblyName;
}
return unresolvedModel;
}
void AppendAssemblyFileToList(string assemblyFile)
{
IAssemblyModel assemblyModel = CreateAssemblyModelFromFile(assemblyFile);
if (assemblyModel != null) {
AssemblyList.Assemblies.Add(assemblyModel);
} else {
// TODO Throw exception?
}
}
/// <summary>
/// Activates the specified workspace.
/// </summary>
void ActivateWorkspace(PersistedWorkspace workspace)
{
// Update the activation flags in workspace list
foreach (var workspaceElement in persistedWorkspaces) {
workspaceElement.IsActive = (workspaceElement == workspace);
}
UpdateActiveWorkspace();
}
/// <summary>
/// Updates active workspace and AssemblyList according to <see cref="PersistedWorkspace.IsActive"/> flags.
/// </summary>
void UpdateActiveWorkspace()
{
if ((AssemblyList != null) && (activeWorkspace != null)) {
// Temporarily detach from event handler
AssemblyList.Assemblies.CollectionChanged -= AssemblyListCollectionChanged;
}
activeWorkspace = persistedWorkspaces.FirstOrDefault(w => w.IsActive);
if (activeWorkspace == null) {
// If no workspace is active, activate default
var defaultWorkspace = persistedWorkspaces.FirstOrDefault(w => w.Name == DefaultWorkspaceName);
activeWorkspace = defaultWorkspace;
defaultWorkspace.IsActive = true;
}
AssemblyList.Assemblies.Clear();
if (activeWorkspace != null) {
foreach (string assemblyFile in activeWorkspace.AssemblyFiles) {
AppendAssemblyFileToList(assemblyFile);
}
}
// Attach to event handler, again.
if (AssemblyList != null) {
AssemblyList.Assemblies.CollectionChanged += AssemblyListCollectionChanged;
}
}
}
}

4
src/Main/SharpDevelop/Dom/ClassBrowser/ClassBrowserTreeNodesFactory.cs

@ -21,6 +21,8 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -21,6 +21,8 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
return typeof(ITypeDefinitionModel);
if (model is IMemberModel)
return typeof(IMemberModel);
if (model is IAssemblyModel)
return typeof(IAssemblyModel);
return null;
}
@ -36,6 +38,8 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser @@ -36,6 +38,8 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
return new TypeDefinitionTreeNode((ITypeDefinitionModel)model);
if (model is IMemberModel)
return new MemberTreeNode((IMemberModel)model);
if (model is IAssemblyModel)
return new AssemblyTreeNode((IAssemblyModel) model);
return null;
}
}

85
src/Main/SharpDevelop/Dom/ClassBrowser/Commands.cs

@ -0,0 +1,85 @@ @@ -0,0 +1,85 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.IO;
using System.Linq;
using Microsoft.Win32;
namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
{
/// <summary>
/// Description of OpenAssemblyFromFileCommand.
/// </summary>
class OpenAssemblyFromFileCommand : SimpleCommand
{
public override void Execute(object parameter)
{
var classBrowser = SD.GetService<IClassBrowser>();
if (classBrowser != null) {
OpenFileDialog openFileDialog = new OpenFileDialog();
openFileDialog.Filter = "Assembly files (*.exe, *.dll)|*.exe;*.dll";
openFileDialog.CheckFileExists = true;
openFileDialog.CheckPathExists = true;
if (openFileDialog.ShowDialog() ?? false)
{
classBrowser.AssemblyList.Assemblies.Add(ClassBrowserPad.CreateAssemblyModelFromFile(openFileDialog.FileName));
}
}
}
}
/// <summary>
/// Description of OpenAssemblyFromGACCommand.
/// </summary>
class OpenAssemblyFromGACCommand : SimpleCommand
{
public override void Execute(object parameter)
{
var classBrowser = SD.GetService<IClassBrowser>();
if (classBrowser != null) {
OpenFromGacDialog gacDialog = new OpenFromGacDialog();
if (gacDialog.ShowDialog() ?? false)
{
foreach (string assemblyFile in gacDialog.SelectedFileNames) {
classBrowser.AssemblyList.Assemblies.Add(ClassBrowserPad.CreateAssemblyModelFromFile(assemblyFile));
}
}
}
}
}
/// <summary>
/// Description of RemoveAssemblyCommand.
/// </summary>
class RemoveAssemblyCommand : SimpleCommand
{
public override bool CanExecute(object parameter)
{
return parameter is AssemblyModel;
}
public override void Execute(object parameter)
{
var classBrowser = SD.GetService<IClassBrowser>();
if (classBrowser != null) {
IAssemblyModel assemblyModel = (IAssemblyModel) parameter;
classBrowser.AssemblyList.Assemblies.Remove(assemblyModel);
}
}
}
/// <summary>
/// Description of RemoveAssemblyCommand.
/// </summary>
class ClassBrowserCollapseAllCommand : SimpleCommand
{
public override void Execute(object parameter)
{
// var classBrowser = SD.GetService<IClassBrowser>() as ClassBrowserPad;
// if (classBrowser != null) {
// classBrowser.TreeView
// }
}
}
}

18
src/Main/SharpDevelop/Dom/ClassBrowser/OpenAssemblyCommand.cs

@ -1,18 +0,0 @@ @@ -1,18 +0,0 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using Microsoft.Win32;
namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
{
/// <summary>
/// Description of OpenAssemblyCommand.
/// </summary>
class OpenAssemblyCommand : SimpleCommand
{
public override void Execute(object parameter)
{
}
}
}

46
src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml

@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
<Window
x:Class="ICSharpCode.SharpDevelop.Dom.ClassBrowser.OpenFromGacDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:core="http://icsharpcode.net/sharpdevelop/core"
Title="Open From GAC"
Style="{DynamicResource DialogWindow}"
WindowStartupLocation="CenterOwner"
ResizeMode="CanResizeWithGrip"
MinWidth="200"
MinHeight="150"
Height="350"
Width="750"
FocusManager.FocusedElement="{Binding ElementName=filterTextBox}">
<Grid
Margin="12,8">
<Grid.RowDefinitions>
<RowDefinition
Height="Auto" />
<RowDefinition
Height="1*" />
<RowDefinition
Height="Auto" />
</Grid.RowDefinitions>
<DockPanel>
<Label DockPanel.Dock="Left" Target="{Binding ElementName=filterTextBox}">_Search:</Label>
<TextBox Name="filterTextBox" TextChanged="FilterTextBox_TextChanged" />
</DockPanel>
<ListView Name="listView" Grid.Row="1" Margin="0, 8" core:SortableGridViewColumn.SortMode="Automatic" SelectionChanged="ListView_SelectionChanged">
<ListView.View>
<GridView>
<core:SortableGridViewColumn x:Name="nameColumn" Width="300" Header="Reference Name" DisplayMemberBinding="{Binding ShortName}" />
<core:SortableGridViewColumn Width="75" Header="Version" DisplayMemberBinding="{Binding Version}" />
<core:SortableGridViewColumn Width="65" Header="Culture" DisplayMemberBinding="{Binding Culture}" />
<core:SortableGridViewColumn Width="115" Header="Public Key Token" DisplayMemberBinding="{Binding PublicKeyToken}" />
<core:SortableGridViewColumn Width="1000" Header="Location" DisplayMemberBinding="{Binding FileName}" />
</GridView>
</ListView.View>
</ListView>
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
<Button IsDefault="True" Margin="2,0" Height="23" MinWidth="75" IsEnabled="False" Name="okButton" Click="OKButton_Click">Open</Button>
<Button IsCancel="True" Margin="2,0" Height="23" MinWidth="75">Cancel</Button>
</StackPanel>
<ProgressBar Grid.Row="1" Height="10" HorizontalAlignment="Stretch" Name="gacReadingProgressBar" VerticalAlignment="Bottom" Visibility="Hidden" />
</Grid>
</Window>

188
src/Main/SharpDevelop/Dom/ClassBrowser/OpenFromGacDialog.xaml.cs

@ -0,0 +1,188 @@ @@ -0,0 +1,188 @@
// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Threading;
using ICSharpCode.Core.Presentation;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Parser;
namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
{
/// <summary>
/// Interaction logic for OpenFromGacDialog.xaml
/// </summary>
public partial class OpenFromGacDialog : Window
{
ObservableCollection<GacEntry> gacEntries = new ObservableCollection<GacEntry>();
ObservableCollection<GacEntry> filteredEntries = new ObservableCollection<GacEntry>();
Predicate<GacEntry> filterMethod = _ => true;
volatile bool cancelFetchThread;
public OpenFromGacDialog()
{
InitializeComponent();
FormLocationHelper.ApplyWindow(this, "ICSharpCode.SharpDevelop.Dom.OpenFromGacDialog.Bounds", true);
listView.ItemsSource = filteredEntries;
SortableGridViewColumn.SetCurrentSortColumn(listView, nameColumn);
SortableGridViewColumn.SetSortDirection(listView, ColumnSortDirection.Ascending);
new Thread(new ThreadStart(FetchGacContents)).Start();
}
protected override void OnClosing(CancelEventArgs e)
{
base.OnClosing(e);
cancelFetchThread = true;
}
#region Fetch Gac Contents
sealed class GacEntry
{
readonly DomAssemblyName r;
readonly string fileName;
string formattedVersion;
public GacEntry(DomAssemblyName r, string fileName)
{
this.r = r;
this.fileName = fileName;
}
public string FullName {
get { return r.FullName; }
}
public string ShortName {
get { return r.ShortName; }
}
public string FileName {
get { return fileName; }
}
public Version Version {
get { return r.Version; }
}
public string FormattedVersion {
get {
if (formattedVersion == null)
formattedVersion = Version.ToString();
return formattedVersion;
}
}
public string Culture {
get { return r.Culture; }
}
public string PublicKeyToken {
get {
StringBuilder s = new StringBuilder();
foreach (byte b in r.PublicKeyToken)
s.Append(b.ToString("x2"));
return s.ToString();
}
}
public override string ToString()
{
return r.FullName;
}
}
void FetchGacContents()
{
IGlobalAssemblyCacheService gacService = SD.GetService<IGlobalAssemblyCacheService>();
HashSet<string> fullNames = new HashSet<string>();
UpdateProgressBar(pg => { pg.Visibility = System.Windows.Visibility.Visible; pg.IsIndeterminate = true; });
var list = gacService.Assemblies.TakeWhile(_ => !cancelFetchThread).ToList();
UpdateProgressBar(pg => { pg.IsIndeterminate = false; pg.Maximum = list.Count; });
foreach (var r in list) {
if (cancelFetchThread)
break;
if (fullNames.Add(r.FullName)) { // filter duplicates
var file = gacService.FindAssemblyInNetGac(r);
if (file != null) {
var entry = new GacEntry(r, file);
UpdateProgressBar(pg => { pg.Value = pg.Value + 1; AddNewEntry(entry); });
}
}
}
UpdateProgressBar(pg => { pg.Visibility = System.Windows.Visibility.Hidden; });
}
void UpdateProgressBar(Action<ProgressBar> updateAction)
{
Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action)(() => updateAction(gacReadingProgressBar)));
}
void AddNewEntry(GacEntry entry)
{
gacEntries.Add(entry);
if (filterMethod(entry))
filteredEntries.Add(entry);
}
#endregion
void FilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
{
string filterString = filterTextBox.Text.Trim();
if (filterString.Length == 0)
filterMethod = _ => true;
else {
var elements = filterString.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
filterMethod = entry => elements.All(el => Contains(entry.FullName, el) || Contains(entry.FormattedVersion, el));
}
filteredEntries.Clear();
filteredEntries.AddRange(gacEntries.Where(entry => filterMethod(entry)));
}
static bool Contains(string s, string subString)
{
return s.IndexOf(subString, StringComparison.OrdinalIgnoreCase) >= 0;
}
void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
okButton.IsEnabled = listView.SelectedItems.Count > 0;
}
void OKButton_Click(object sender, RoutedEventArgs e)
{
this.DialogResult = true;
Close();
}
public string[] SelectedFileNames {
get {
return listView.SelectedItems.OfType<GacEntry>().Select(e => e.FileName).ToArray();
}
}
}
}

BIN
src/Main/SharpDevelop/Resources/BitmapResources.resources

Binary file not shown.

7
src/Main/SharpDevelop/SharpDevelop.csproj

@ -108,7 +108,11 @@ @@ -108,7 +108,11 @@
</Compile>
<Compile Include="Dom\ClassBrowser\ClassBrowserPad.cs" />
<Compile Include="Dom\ClassBrowser\ClassBrowserTreeNodesFactory.cs" />
<Compile Include="Dom\ClassBrowser\OpenAssemblyCommand.cs" />
<Compile Include="Dom\ClassBrowser\Commands.cs" />
<Compile Include="Dom\ClassBrowser\OpenFromGacDialog.xaml.cs">
<DependentUpon>OpenFromGacDialog.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Dom\ModelFactory.cs" />
<Compile Include="Dom\MemberModel.cs" />
<Compile Include="Dom\NamespaceModel.cs" />
@ -331,6 +335,7 @@ @@ -331,6 +335,7 @@
<Folder Include="Workbench\DisplayBinding" />
</ItemGroup>
<ItemGroup>
<Page Include="Dom\ClassBrowser\OpenFromGacDialog.xaml" />
<Page Include="OptionPanels\LoadSaveOptions.xaml" />
<Page Include="Startup\App.xaml" />
<Page Include="Workbench\WpfWorkbench.xaml" />

6
src/Main/SharpDevelop/Workbench/FileService.cs

@ -454,12 +454,12 @@ namespace ICSharpCode.SharpDevelop.Workbench @@ -454,12 +454,12 @@ namespace ICSharpCode.SharpDevelop.Workbench
try {
IViewContent content = OpenFile(fileName);
if (content is IPositionable) {
// TODO: enable jumping to a particular view
IPositionable positionable = content.GetService<IPositionable>();
if (positionable != null) {
content.WorkbenchWindow.ActiveViewContent = content;
NavigationService.ResumeLogging();
loggingResumed = true;
((IPositionable)content).JumpTo(Math.Max(1, line), Math.Max(1, column));
positionable.JumpTo(Math.Max(1, line), Math.Max(1, column));
} else {
NavigationService.ResumeLogging();
loggingResumed = true;

Loading…
Cancel
Save