diff options
32 files changed, 73 insertions, 100 deletions
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs index 362c35e423..339b74e12a 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs @@ -97,26 +97,28 @@ namespace MonoDevelop.CSharp.Highlighting }; } - protected override IEnumerable<MemberReference> GetReferences (UsageData resolveResult, CancellationToken token) + protected override async Task<IList<MemberReference>> GetReferencesAsync (UsageData resolveResult, CancellationToken token) { + var result = new List<MemberReference> (); if (resolveResult.Symbol == null) - yield break; + return result; var doc = resolveResult.Document; var documents = ImmutableHashSet.Create (doc); var symbol = resolveResult.Symbol; foreach (var loc in symbol.Locations) { if (loc.IsInSource && loc.SourceTree.FilePath == doc.FilePath) - yield return new MemberReference (symbol, doc.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length) { + result.Add (new MemberReference (symbol, doc.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length) { ReferenceUsageType = ReferenceUsageType.Declariton - }; + }); } - foreach (var mref in SymbolFinder.FindReferencesAsync (symbol, TypeSystemService.Workspace.CurrentSolution, documents, token).Result) { + foreach (var mref in await SymbolFinder.FindReferencesAsync (symbol, TypeSystemService.Workspace.CurrentSolution, documents, token)) { foreach (var loc in mref.Locations) { - yield return new MemberReference (symbol, doc.FilePath, loc.Location.SourceSpan.Start, loc.Location.SourceSpan.Length) { + result.Add (new MemberReference (symbol, doc.FilePath, loc.Location.SourceSpan.Start, loc.Location.SourceSpan.Length) { ReferenceUsageType = GetUsage (loc.Location.SourceTree.GetRoot ().FindNode (loc.Location.SourceSpan)) - }; + }); } } + return result; } static ReferenceUsageType GetUsage (SyntaxNode node) diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs index a0b04e7edd..d1486c22e8 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs @@ -217,9 +217,9 @@ namespace MonoDevelop.VersionControl.Views get { return defaultEolMarker; } } - public MonoDevelop.Ide.Editor.ControlLeftRightMode ControlLeftRightMode { + public MonoDevelop.Ide.Editor.WordNavigationStyle WordNavigationStyle { get { - return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.ControlLeftRightMode; + return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.WordNavigationStyle; } set { } @@ -244,14 +244,11 @@ namespace MonoDevelop.VersionControl.Views return; } - switch (ControlLeftRightMode) { - case MonoDevelop.Ide.Editor.ControlLeftRightMode.MonoDevelop: + switch (WordNavigationStyle) { + case MonoDevelop.Ide.Editor.WordNavigationStyle.Unix: this.wordFindStrategy = new EmacsWordFindStrategy (true); break; - case MonoDevelop.Ide.Editor.ControlLeftRightMode.Emacs: - this.wordFindStrategy = new EmacsWordFindStrategy (false); - break; - case MonoDevelop.Ide.Editor.ControlLeftRightMode.SharpDevelop: + case MonoDevelop.Ide.Editor.WordNavigationStyle.Windows: this.wordFindStrategy = new SharpDevelopWordFindStrategy (); break; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs index dba17c668d..a2508d6588 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs @@ -191,9 +191,9 @@ namespace MonoDevelop.Components.MainToolbar return; if (region.Length <= 0) { if (Pattern.LineNumber == 0) { - IdeApp.Workbench.OpenDocument (SelectedItemFileName); + IdeApp.Workbench.OpenDocument (SelectedItemFileName, project: null); } else { - IdeApp.Workbench.OpenDocument (SelectedItemFileName, Pattern.LineNumber, Pattern.HasColumn ? Pattern.Column : 1); + IdeApp.Workbench.OpenDocument (SelectedItemFileName, null, Pattern.LineNumber, Pattern.HasColumn ? Pattern.Column : 1); } } else { IdeApp.Workbench.OpenDocument (new FileOpenInformation (SelectedItemFileName, null) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatterService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatterService.cs index 6459b3b821..3c028ac631 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatterService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatterService.cs @@ -83,7 +83,7 @@ namespace MonoDevelop.Ide.CodeFormatting if (fmt == null) return; if (fmt.SupportsOnTheFlyFormatting) { - fmt.OnTheFlyFormat (editor, ctx, segment.Offset, segment.EndOffset); + fmt.OnTheFlyFormat (editor, ctx, segment); return; } editor.Text = fmt.FormatText (ctx.HasProject ? ctx.Project.Policies : null, editor.Text, segment); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs index 376002197d..d3f0f3a801 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs @@ -452,7 +452,7 @@ namespace MonoDevelop.Ide.CodeTemplates if (prettyPrinter != null && prettyPrinter.SupportsOnTheFlyFormatting) { int endOffset = template.InsertPosition + template.Code.Length; var oldVersion = data.Version; - prettyPrinter.OnTheFlyFormat (editor, context, template.InsertPosition, endOffset); + prettyPrinter.OnTheFlyFormat (editor, context, TextSegment.FromBounds (template.InsertPosition, endOffset)); foreach (var textLink in template.TextLinks) { for (int i = 0; i < textLink.Links.Count; i++) { var segment = textLink.Links [i]; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs index 62f031f995..42129615ae 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs @@ -294,7 +294,7 @@ namespace MonoDevelop.Ide.Commands protected override void Run (object dataItem) { - IdeApp.Workbench.OpenDocument ((string)dataItem); + IdeApp.Workbench.OpenDocument ((string)dataItem, project: null); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AbstractUsagesExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AbstractUsagesExtension.cs index 186860ca86..bcbf3aa071 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AbstractUsagesExtension.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AbstractUsagesExtension.cs @@ -128,7 +128,7 @@ namespace MonoDevelop.Ide.Editor.Extension /// <returns>The references.</returns> /// <param name="resolveResult">The resolve result given in 'TryResolve'.</param> /// <param name="token">A cancellation token to cancel the operation.</param> - protected abstract IEnumerable<MemberReference> GetReferences (T resolveResult, CancellationToken token); + protected abstract Task<IList<MemberReference>> GetReferencesAsync (T resolveResult, CancellationToken token); async void DelayedTooltipShow () { @@ -142,16 +142,13 @@ namespace MonoDevelop.Ide.Editor.Extension ClearQuickTasks (); return; } - - Task.Run (delegate { - var list = GetReferences (result, token).ToList (); - if (!token.IsCancellationRequested) { - Gtk.Application.Invoke (delegate { - if (!token.IsCancellationRequested) - ShowReferences (list); - }); - } - }); + var list = await GetReferencesAsync (result, token); + if (!token.IsCancellationRequested) { + Gtk.Application.Invoke (delegate { + if (!token.IsCancellationRequested) + ShowReferences (list); + }); + } } catch (Exception e) { LoggingService.LogError ("Unhandled Exception in HighlightingUsagesExtension", e); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs index 3f60819204..7d58d9f4d3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs @@ -31,14 +31,6 @@ using MonoDevelop.Ide.Editor.Extension; namespace MonoDevelop.Ide.Editor { - [Obsolete ("Use WordNavigationStyle")] - public enum ControlLeftRightMode - { - MonoDevelop, - Emacs, - SharpDevelop - } - public enum WordNavigationStyle { Unix, @@ -246,11 +238,8 @@ namespace MonoDevelop.Ide.Editor DefaultSourceEditorOptions (TextStylePolicy currentPolicy) { - var defaultControlMode = (ControlLeftRightMode)Enum.Parse (typeof(ControlLeftRightMode), DesktopService.DefaultControlLeftRightBehavior); - controlLeftRightMode = ConfigurationProperty.Create ("ControlLeftRightMode", defaultControlMode); - WordNavigationStyle defaultWordNavigation = WordNavigationStyle.Unix; - if (Platform.IsWindows || controlLeftRightMode.Value == ControlLeftRightMode.SharpDevelop) { + if (Platform.IsWindows) { defaultWordNavigation = WordNavigationStyle.Windows; } wordNavigationStyle = ConfigurationProperty.Create ("WordNavigationStyle", defaultWordNavigation); @@ -439,18 +428,6 @@ namespace MonoDevelop.Ide.Editor } } } - - ConfigurationProperty<ControlLeftRightMode> controlLeftRightMode; - [Obsolete("Use WordNavigationStyle")] - public ControlLeftRightMode ControlLeftRightMode { - get { - return controlLeftRightMode; - } - set { - if (controlLeftRightMode.Set (value)) - OnChanged (EventArgs.Empty); - } - } ConfigurationProperty<WordNavigationStyle> wordNavigationStyle; public WordNavigationStyle WordNavigationStyle { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs index 215ea3b4cd..9e1409c920 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs @@ -801,7 +801,7 @@ namespace MonoDevelop.Ide.Editor var anchor = textEditor.SelectionAnchorOffset; int lines = 0; - IDocumentLine first = null; + //IDocumentLine first = null; IDocumentLine last = null; var oldVersion = textEditor.Version; foreach (var line in GetSelectedLines (textEditor)) { @@ -811,7 +811,7 @@ namespace MonoDevelop.Ide.Editor lines++; } - first = line; + //first = line; if (last == null) last = line; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs index e1bb7cf4b4..30b9bdca95 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs @@ -698,7 +698,7 @@ namespace MonoDevelop.Ide.FindInFiles if (result != null) { var loc = GetLocation (result); store.SetValue (iter, DidReadColumn, true); - IdeApp.Workbench.OpenDocument (result.FileName, loc.Line, loc.Column); + IdeApp.Workbench.OpenDocument (result.FileName, null, loc.Line, loc.Column); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs index e6292949ca..ae7b59f8f4 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs @@ -123,7 +123,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad ProjectReference pref = CurrentNode.DataItem as ProjectReference; if (pref != null) { foreach (string fileName in pref.GetReferencedFileNames (IdeApp.Workspace.ActiveConfiguration)) - IdeApp.Workbench.OpenDocument (fileName); + IdeApp.Workbench.OpenDocument (fileName, project: null); } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ImplicitFrameworkAssemblyReferenceNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ImplicitFrameworkAssemblyReferenceNodeBuilder.cs index 08233fc98f..e42d8e6dd4 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ImplicitFrameworkAssemblyReferenceNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ImplicitFrameworkAssemblyReferenceNodeBuilder.cs @@ -74,7 +74,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad public override void ActivateItem () { var aref = (ImplicitFrameworkAssemblyReference) CurrentNode.DataItem; - IdeApp.Workbench.OpenDocument (aref.Assembly.Location); + IdeApp.Workbench.OpenDocument (aref.Assembly.Location, project: null); } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionFolderFileNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionFolderFileNodeBuilder.cs index 497cd3a870..353cae8399 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionFolderFileNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionFolderFileNodeBuilder.cs @@ -119,7 +119,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad public override void ActivateItem () { SolutionFolderFileNode file = (SolutionFolderFileNode) CurrentNode.DataItem; - IdeApp.Workbench.OpenDocument (file.FileName); + IdeApp.Workbench.OpenDocument (file.FileName, project: null); } public override DragOperation CanDragNode () diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionNodeBuilder.cs index 82d17cde9c..fe6ac18b97 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionNodeBuilder.cs @@ -311,7 +311,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad public void OnEditSolution () { var solution = (Solution) CurrentNode.DataItem; - IdeApp.Workbench.OpenDocument (solution.FileName); + IdeApp.Workbench.OpenDocument (solution.FileName, project:null); } [CommandUpdateHandler (ProjectCommands.EditSolutionItem)] diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs index 393636a54f..2188ddec1f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs @@ -118,7 +118,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad public override void ActivateItem () { SystemFile file = CurrentNode.DataItem as SystemFile; - IdeApp.Workbench.OpenDocument (file.Path); + IdeApp.Workbench.OpenDocument (file.Path, project: null); } public override void DeleteMultipleItems () diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs index d831511d57..33ae288549 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs @@ -151,7 +151,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad public void OnEditUnknownSolutionItem () { UnknownSolutionItem si = (UnknownSolutionItem) CurrentNode.DataItem; - IdeApp.Workbench.OpenDocument (si.FileName); + IdeApp.Workbench.OpenDocument (si.FileName, project: null); } [CommandUpdateHandler (ProjectCommands.EditSolutionItem)] diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs index 0eb985da7d..3d059b3016 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs @@ -89,7 +89,7 @@ namespace MonoDevelop.Ide.Gui.Pads return; if (populated.ContainsKey (node)) return; - if (node.Nodes == null) + if (node.ChildNodes == null) return; TreeIter iter; if (store.IterChildren (out iter, args.Iter)) { @@ -118,10 +118,10 @@ namespace MonoDevelop.Ide.Gui.Pads void PopulateNode (TreeIter parent) { Node node = (Node)store.GetValue (parent, 1); - if (node.Nodes == null) + if (node.ChildNodes == null) return; - foreach (Node n in node.Nodes) { + foreach (Node n in node.ChildNodes) { store.AppendValues (parent, n.Caption, n); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/FileViewer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/FileViewer.cs index ea9bbf240d..dbd798402d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/FileViewer.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/FileViewer.cs @@ -92,7 +92,7 @@ namespace MonoDevelop.Ide.Gui public Document OpenFile (string filePath, Encoding encoding) { if (binding != null) - return IdeApp.Workbench.OpenDocument (filePath, -1, -1, OpenDocumentOptions.Default, encoding, binding); + return IdeApp.Workbench.OpenDocument (filePath, null, -1, -1, OpenDocumentOptions.Default, encoding, binding); else { app.Launch (filePath); return null; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenWorkbenchWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenWorkbenchWindow.cs index d5ebb8c29c..fedbecc6e8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenWorkbenchWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenWorkbenchWindow.cs @@ -111,10 +111,10 @@ namespace MonoDevelop.Ide.Gui } public event EventHandler TitleChanged { add {} remove {} } - public event EventHandler DocumentChanged; - public event MonoDevelop.Ide.Gui.WorkbenchWindowEventHandler Closing; - public event MonoDevelop.Ide.Gui.WorkbenchWindowEventHandler Closed; - public event MonoDevelop.Ide.Gui.ActiveViewContentEventHandler ActiveViewContentChanged; - public event EventHandler ViewsChanged; + public event EventHandler DocumentChanged { add {} remove {} } + public event MonoDevelop.Ide.Gui.WorkbenchWindowEventHandler Closing { add {} remove {} } + public event MonoDevelop.Ide.Gui.WorkbenchWindowEventHandler Closed { add {} remove {} } + public event MonoDevelop.Ide.Gui.ActiveViewContentEventHandler ActiveViewContentChanged { add {} remove {} } + public event EventHandler ViewsChanged { add {} remove {} } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupInfo.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupInfo.cs index abaa1b0225..9a7e1c5206 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupInfo.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupInfo.cs @@ -85,7 +85,7 @@ namespace MonoDevelop.Ide.Gui int.TryParse (fileMatch.Groups["line"].Value, out line); if (fileMatch.Groups["column"].Success) int.TryParse (fileMatch.Groups["column"].Value, out column); - var file = new FileOpenInformation (filename, line, column, OpenDocumentOptions.Default); + var file = new FileOpenInformation (filename, null, line, column, OpenDocumentOptions.Default); requestedFileList.Add (file); } } else if (a[0] == '-' || a[0] == '/') { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs index 0dc3b4384e..96b3b6ff30 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs @@ -62,7 +62,7 @@ namespace MonoDevelop.Ide.Gui { readonly ProgressMonitorManager monitors = new ProgressMonitorManager (); readonly List<Document> documents = new List<Document> (); - readonly List<Split> splits = new List<Split> (); + // readonly List<Split> splits = new List<Split> (); DefaultWorkbench workbench; PadCollection pads; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs index 8ff86d6fbf..1f7eb8dd0a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs @@ -718,7 +718,7 @@ namespace MonoDevelop.Ide.Projects static void RunTemplateActions (ProcessedTemplateResult templateResult)
{
foreach (string action in templateResult.Actions) {
- IdeApp.Workbench.OpenDocument (Path.Combine (templateResult.ProjectBasePath, action));
+ IdeApp.Workbench.OpenDocument (Path.Combine (templateResult.ProjectBasePath, action), project: null);
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs index e627bccb13..c8f6f038b0 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs @@ -525,7 +525,7 @@ namespace MonoDevelop.Ide.Tasks { TaskListEntry task = SelectedTask; if (task != null && ! String.IsNullOrEmpty (task.FileName)) { - var doc = IdeApp.Workbench.OpenDocument (task.FileName, Math.Max (1, task.Line), Math.Max (1, task.Column)); + var doc = IdeApp.Workbench.OpenDocument (task.FileName, null, Math.Max (1, task.Line), Math.Max (1, task.Column)); if (doc != null && doc.HasProject && doc.Project is DotNetProject) { string[] commentTags = doc.CommentTags; if (commentTags != null && commentTags.Length == 1) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs index d4ba526f26..dfb83e7deb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs @@ -312,7 +312,7 @@ namespace MonoDevelop.Ide.Templates { if (await IdeApp.Workspace.OpenWorkspaceItem (createdSolutionName)) { foreach (string action in actions) - IdeApp.Workbench.OpenDocument (Path.Combine (createdProjectInformation.ProjectBasePath, action)); + IdeApp.Workbench.OpenDocument (Path.Combine (createdProjectInformation.ProjectBasePath, action), project:null); return true; } return false; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs index db7cc01c6b..e01f260840 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs @@ -185,7 +185,7 @@ namespace MonoDevelop.Ide.Templates public override void Show () { if (!suppressAutoOpen) - IdeApp.Workbench.OpenDocument (generatedFile); + IdeApp.Workbench.OpenDocument (generatedFile, project: null); } // Creates a file and saves it to disk. Returns the path to the new file diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Ambience.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Ambience.cs index fe53a0c8e4..8d206a8efe 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Ambience.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/Ambience.cs @@ -240,7 +240,7 @@ namespace MonoDevelop.Ide.TypeSystem if (entity != null) { var ambience = new ICSharpCode.NRefactory.CSharp.CSharpAmbience (); ambience.ConversionFlags = ICSharpCode.NRefactory.TypeSystem.ConversionFlags.ShowParameterList | ICSharpCode.NRefactory.TypeSystem.ConversionFlags.ShowParameterNames | ICSharpCode.NRefactory.TypeSystem.ConversionFlags.ShowTypeParameterList; - return ambience.ConvertEntity (entity); + return ambience.ConvertSymbol (entity); } } catch (Exception e) { LoggingService.LogWarning ("Invalid cref:" + cref, e); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MetadataReferenceCache.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MetadataReferenceCache.cs index 77d8e818eb..57c1bd4d58 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MetadataReferenceCache.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MetadataReferenceCache.cs @@ -80,11 +80,11 @@ namespace MonoDevelop.Ide.TypeSystem } } - static Timer timer; + //static Timer timer; static MetadataReferenceCache () { - timer = new Timer ((o) => CheckForChanges (), null, 10000, 10000); + //timer = new Timer ((o) => CheckForChanges (), null, 10000, 10000); } //TODO: Call this method when focus returns to MD or even better use FileSystemWatcher diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs index b701bd8ecc..0147dd632d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs @@ -435,7 +435,7 @@ namespace MonoDevelop.Ide.TypeSystem static DocumentInfo CreateDocumentInfo (SolutionData data, string projectName, ProjectData id, MonoDevelop.Projects.ProjectFile f) { var filePath = f.FilePath; - var sourceCodeKind = filePath.Extension == ".sketchcs" ? SourceCodeKind.Interactive : SourceCodeKind.Regular; + var sourceCodeKind = filePath.Extension == ".sketchcs" ? SourceCodeKind.Script : SourceCodeKind.Regular; return DocumentInfo.Create ( id.GetOrCreateDocumentId (filePath), f.FilePath, @@ -756,9 +756,9 @@ namespace MonoDevelop.Ide.TypeSystem startOffset = originalOffset; } if (change.NewText.Length == 0) { - formatter.OnTheFlyFormat ((TextEditor)data, documentContext, Math.Max (0, startOffset - 1), Math.Min (data.Length, startOffset + 1)); + formatter.OnTheFlyFormat ((TextEditor)data, documentContext, TextSegment.FromBounds (Math.Max (0, startOffset - 1), Math.Min (data.Length, startOffset + 1))); } else { - formatter.OnTheFlyFormat ((TextEditor)data, documentContext, startOffset, startOffset + change.NewText.Length); + formatter.OnTheFlyFormat ((TextEditor)data, documentContext, new TextSegment (startOffset, change.NewText.Length)); } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ProjectCacheService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ProjectCacheService.cs index 533731445f..14021cc0a4 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ProjectCacheService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/ProjectCacheService.cs @@ -538,8 +538,8 @@ namespace MonoDevelop.Ide.TypeSystem private static Action<Exception> s_fatalHandler; private static Action<Exception> s_nonFatalHandler; - private static Exception s_reportedException; - private static string s_reportedExceptionMessage; + //private static Exception s_reportedException; + //private static string s_reportedExceptionMessage; /// <summary> /// Set by the host to a fail fast trigger, @@ -658,8 +658,8 @@ namespace MonoDevelop.Ide.TypeSystem private static void Report (Exception exception, Action<Exception> handler) { // hold onto last exception to make investigation easier - s_reportedException = exception; - s_reportedExceptionMessage = exception.ToString (); + //s_reportedException = exception; + //s_reportedExceptionMessage = exception.ToString (); handler?.Invoke (exception); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs index 52e572386b..fd902c3baa 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/StockIcons.cs @@ -37,7 +37,7 @@ namespace MonoDevelop.Ide.TypeSystem static readonly IconId Field = "md-field"; static readonly IconId Interface = "md-interface"; static readonly IconId Method = "md-method"; - static readonly IconId ExtensionMethod = "md-extensionmethod"; + //static readonly IconId ExtensionMethod = "md-extensionmethod"; static readonly IconId Property = "md-property"; static readonly IconId Struct = "md-struct"; static readonly IconId Delegate = "md-delegate"; @@ -50,7 +50,7 @@ namespace MonoDevelop.Ide.TypeSystem static readonly IconId InternalField = "md-internal-field"; static readonly IconId InternalInterface = "md-internal-interface"; static readonly IconId InternalMethod = "md-internal-method"; - static readonly IconId InternalExtensionMethod = "md-internal-extensionmethod"; + //static readonly IconId InternalExtensionMethod = "md-internal-extensionmethod"; static readonly IconId InternalProperty = "md-internal-property"; static readonly IconId InternalStruct = "md-internal-struct"; @@ -61,7 +61,7 @@ namespace MonoDevelop.Ide.TypeSystem static readonly IconId InternalAndProtectedField = "md-InternalAndProtected-field"; static readonly IconId InternalAndProtectedInterface = "md-InternalAndProtected-interface"; static readonly IconId InternalAndProtectedMethod = "md-InternalAndProtected-method"; - static readonly IconId InternalAndProtectedExtensionMethod = "md-InternalAndProtected-extensionmethod"; + //static readonly IconId InternalAndProtectedExtensionMethod = "md-InternalAndProtected-extensionmethod"; static readonly IconId InternalAndProtectedProperty = "md-InternalAndProtected-property"; static readonly IconId InternalAndProtectedStruct = "md-InternalAndProtected-struct"; @@ -72,7 +72,7 @@ namespace MonoDevelop.Ide.TypeSystem static readonly IconId PrivateField = "md-private-field"; static readonly IconId PrivateInterface = "md-private-interface"; static readonly IconId PrivateMethod = "md-private-method"; - static readonly IconId PrivateExtensionMethod = "md-private-extensionmethod"; + //static readonly IconId PrivateExtensionMethod = "md-private-extensionmethod"; static readonly IconId PrivateProperty = "md-private-property"; static readonly IconId PrivateStruct = "md-private-struct"; @@ -83,7 +83,7 @@ namespace MonoDevelop.Ide.TypeSystem static readonly IconId ProtectedField = "md-protected-field"; static readonly IconId ProtectedInterface = "md-protected-interface"; static readonly IconId ProtectedMethod = "md-protected-method"; - static readonly IconId ProtectedExtensionMethod = "md-protected-extensionmethod"; + //static readonly IconId ProtectedExtensionMethod = "md-protected-extensionmethod"; static readonly IconId ProtectedProperty = "md-protected-property"; static readonly IconId ProtectedStruct = "md-protected-struct"; @@ -94,7 +94,7 @@ namespace MonoDevelop.Ide.TypeSystem static readonly IconId ProtectedOrInternalField = "md-ProtectedOrInternal-field"; static readonly IconId ProtectedOrInternalInterface = "md-ProtectedOrInternal-interface"; static readonly IconId ProtectedOrInternalMethod = "md-ProtectedOrInternal-method"; - static readonly IconId ProtectedOrInternalExtensionMethod = "md-ProtectedOrInternal-extensionmethod"; + //static readonly IconId ProtectedOrInternalExtensionMethod = "md-ProtectedOrInternal-extensionmethod"; static readonly IconId ProtectedOrInternalProperty = "md-ProtectedOrInternal-property"; static readonly IconId ProtectedOrInternalStruct = "md-ProtectedOrInternal-struct"; @@ -111,9 +111,9 @@ namespace MonoDevelop.Ide.TypeSystem static readonly IconId[] methodIconTable = { Stock.Method, Stock.PrivateMethod, Stock.Method, Stock.ProtectedMethod, Stock.InternalMethod, Stock.ProtectedOrInternalMethod, Stock.InternalAndProtectedMethod }; - static readonly IconId[] extensionMethodIconTable = { - Stock.ExtensionMethod, Stock.PrivateExtensionMethod, Stock.ExtensionMethod, Stock.ProtectedExtensionMethod, Stock.InternalExtensionMethod, Stock.ProtectedOrInternalExtensionMethod, Stock.InternalAndProtectedExtensionMethod - }; + //static readonly IconId[] extensionMethodIconTable = { + // Stock.ExtensionMethod, Stock.PrivateExtensionMethod, Stock.ExtensionMethod, Stock.ProtectedExtensionMethod, Stock.InternalExtensionMethod, Stock.ProtectedOrInternalExtensionMethod, Stock.InternalAndProtectedExtensionMethod + //}; static readonly IconId[] propertyIconTable = { Stock.Property, Stock.PrivateProperty, Stock.Property, Stock.ProtectedProperty, Stock.InternalProperty, Stock.ProtectedOrInternalProperty, Stock.InternalAndProtectedProperty }; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs index 7c1502c356..eb6e0010da 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs @@ -344,7 +344,7 @@ namespace MonoDevelop.Ide foreach (var file in filteredFiles) { try { - Workbench.OpenDocument (file.FileName, file.Line, file.Column, file.Options); + Workbench.OpenDocument (file.FileName, null, file.Line, file.Column, file.Options); } catch (Exception ex) { MessageService.ShowError (GettextCatalog.GetString ("Could not open file: {0}", file.FileName), ex); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs index 317e98810e..0fcd990a9a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs @@ -488,7 +488,7 @@ namespace MonoDevelop.Ide } if (closedDocs != null) { foreach (string doc in closedDocs) { - IdeApp.Workbench.OpenDocument (doc, false); + IdeApp.Workbench.OpenDocument (doc, null, false); } } } |