diff options
author | Lluis Sanchez <llsan@microsoft.com> | 2019-02-15 21:25:10 +0300 |
---|---|---|
committer | Lluis Sanchez <llsan@microsoft.com> | 2019-02-15 21:52:56 +0300 |
commit | 2e9046725a5629d208a35e8312ad5904a05c851f (patch) | |
tree | bc87f59d35ebf88f0683dbbe39bf71c6be5fa6e4 | |
parent | ca94e4851759c70a3f44e6ed4d2d1f3296ed0bcf (diff) |
Track API changes
All services are now referenced from the IdeServices class
216 files changed, 623 insertions, 625 deletions
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpFormatter.fs b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpFormatter.fs index 6faf4bd7f7..9bf114b56f 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpFormatter.fs +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpFormatter.fs @@ -150,7 +150,7 @@ type FSharpFormatter() = | null -> PolicyService.DefaultPolicies | policyBag -> policyBag :> PolicyContainer - let mimeType = DesktopService.GetMimeTypeForUri (editor.FileName.ToString()) + let mimeType = IdeServices.DesktopService.GetMimeTypeForUri (editor.FileName.ToString()) let input = editor.Text if fromOffset = 0 && toOffset = String.length input then formatText (Some editor) policyParent mimeType input Document diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpInteractivePad.fs b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpInteractivePad.fs index dd5d0032d1..10b97c0d67 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpInteractivePad.fs +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpInteractivePad.fs @@ -79,7 +79,7 @@ type FsiDocumentContext() = override x.ParsedDocument = pd override x.AttachToProject(_) = () override x.ReparseDocument() = () - override x.GetOptionSet() = TypeSystemService.Workspace.Options + override x.GetOptionSet() = IdeApp.TypeSystemService.Workspace.Options override x.Project = project :> Project override x.Name = name override x.AnalysisDocument with get() = null @@ -598,7 +598,7 @@ type FSharpFsiEditorCompletion() = inherit CommandHandler() override x.Run() = async { - let project = IdeApp.Workbench.ActiveDocument.Project :?> FSharpProject + let project = IdeApp.Workbench.ActiveDocument.Owner :?> FSharpProject FSharpInteractivePad.Fsi |> Option.iter (fun fsi -> fsi.LoadReferences(project) FSharpInteractivePad.BringToFront(false)) diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/LanguageService.fs b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/LanguageService.fs index 1fea03dc65..dab15e20e2 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/LanguageService.fs +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Services/LanguageService.fs @@ -230,11 +230,11 @@ type LanguageService(dirtyNotify, _extraProjectInfo) as x = let showStatusIcon projectFileName = if loadingProjects.Add projectFileName then - TypeSystemService.ShowTypeInformationGatheringIcon() + IdeApp.TypeSystemService.ShowTypeInformationGatheringIcon() let hideStatusIcon projectFileName = if loadingProjects.Remove projectFileName then - TypeSystemService.HideTypeInformationGatheringIcon() + IdeApp.TypeSystemService.HideTypeInformationGatheringIcon() // Create an instance of interactive checker. The callback is called by the F# compiler service // when its view of the prior-typechecking-state of the start of a file has changed, for example diff --git a/main/src/addins/AspNet/Commands/AddViewDialog.cs b/main/src/addins/AspNet/Commands/AddViewDialog.cs index 4f107b31f5..071ca00426 100644 --- a/main/src/addins/AspNet/Commands/AddViewDialog.cs +++ b/main/src/addins/AspNet/Commands/AddViewDialog.cs @@ -1,4 +1,4 @@ -// +// // AddViewDialog.cs // // Author: @@ -369,7 +369,7 @@ namespace MonoDevelop.AspNet.Commands if (!File.Exists (realPath)) return; - var pd = await TypeSystemService.ParseFile (project, realPath) as WebFormsParsedDocument; + var pd = await IdeApp.TypeSystemService.ParseFile (project, realPath) as WebFormsParsedDocument; if (pd != null) { try { @@ -479,7 +479,7 @@ namespace MonoDevelop.AspNet.Commands public async Task GetTypes (MonoDevelop.Projects.DotNetProject project) {
TypeNamesList = new List<string> (); - var ctx = await TypeSystemService.GetCompilationAsync (project); + var ctx = await IdeApp.TypeSystemService.GetCompilationAsync (project); TypesList = new List<INamedTypeSymbol> (ctx.GetAllTypesInMainAssembly ());
foreach (var typeDef in TypesList) {
TypeNamesList.Add (Ambience.EscapeText (typeDef.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat))); diff --git a/main/src/addins/AspNet/Execution/BrowserLauncher.cs b/main/src/addins/AspNet/Execution/BrowserLauncher.cs index 628b4cdd00..54f4bc1728 100644 --- a/main/src/addins/AspNet/Execution/BrowserLauncher.cs +++ b/main/src/addins/AspNet/Execution/BrowserLauncher.cs @@ -1,4 +1,4 @@ -// +// // BrowserLauncher.cs // // Author: @@ -38,7 +38,7 @@ namespace MonoDevelop.AspNet.Execution public static ProcessAsyncOperation LaunchDefaultBrowser (string url) { try { - DesktopService.ShowUrl (url); + IdeServices.DesktopService.ShowUrl (url); return NullProcessAsyncOperation.Success; } catch (Exception ex) { MessageService.ShowError (GettextCatalog.GetString ("Error launching web browser"), ex.ToString ()); diff --git a/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs b/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs index 852c7dee79..08133edf1d 100644 --- a/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs +++ b/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs @@ -1,4 +1,4 @@ -// +// // AspNetAppProject.cs: ASP.NET "Web Application" project type // // Authors: @@ -704,7 +704,7 @@ namespace MonoDevelop.AspNet.Projects protected override IEnumerable<ExecutionTarget> OnGetExecutionTargets (ConfigurationSelector configuration) { var apps = new List<ExecutionTarget> (); - foreach (var browser in MonoDevelop.Ide.DesktopService.GetApplications ("test.html")) { + foreach (var browser in MonoDevelop.Ide.IdeServices.DesktopService.GetApplications ("test.html")) { if (browser.IsDefault) apps.Insert (0, new BrowserExecutionTarget (browser.Id,browser.DisplayName,browser)); else diff --git a/main/src/addins/AspNet/Razor/RazorCSharpParser.cs b/main/src/addins/AspNet/Razor/RazorCSharpParser.cs index 0494d21402..421a6492a7 100644 --- a/main/src/addins/AspNet/Razor/RazorCSharpParser.cs +++ b/main/src/addins/AspNet/Razor/RazorCSharpParser.cs @@ -443,16 +443,16 @@ namespace MonoDevelop.AspNet.Razor context.CSharpCode = CreateCodeFile (context); context.ParsedSyntaxTree = CSharpSyntaxTree.ParseText (Microsoft.CodeAnalysis.Text.SourceText.From (context.CSharpCode)); - var originalProject = TypeSystemService.GetCodeAnalysisProject (context.Project); + var originalProject = IdeApp.TypeSystemService.GetCodeAnalysisProject (context.Project); if (originalProject != null) { string fileName = context.FileName + ".g.cs"; - var documentId = TypeSystemService.GetDocumentId (originalProject.Id, fileName); + var documentId = IdeApp.TypeSystemService.GetDocumentId (originalProject.Id, fileName); if (documentId == null) { context.AnalysisDocument = originalProject.AddDocument ( fileName, context.ParsedSyntaxTree?.GetRoot ()); } else { - context.AnalysisDocument = TypeSystemService.GetCodeAnalysisDocument (documentId); + context.AnalysisDocument = IdeApp.TypeSystemService.GetCodeAnalysisDocument (documentId); } } } diff --git a/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs b/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs index 12f658bb6b..dbf81d400e 100644 --- a/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs +++ b/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs @@ -1,4 +1,4 @@ -// +// // MasterContentFileDescriptionTemplate.cs // // Author: @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; using MonoDevelop.Core; -using MonoDevelop.Ide.TypeSystem; +using MonoDevelop.Ide; using MonoDevelop.Projects; using MonoDevelop.AspNet.Projects; using MonoDevelop.AspNet.WebForms.Parser; @@ -69,7 +69,7 @@ namespace MonoDevelop.AspNet.WebForms tags ["AspNetMaster"] = aspProj.LocalToVirtualPath (masterPage); try { - var pd = TypeSystemService.ParseFile (project, masterPage.FilePath).Result + var pd = IdeApp.TypeSystemService.ParseFile (project, masterPage.FilePath).Result as WebFormsParsedDocument; if (pd == null) return; diff --git a/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs b/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs index c26b4b7ab6..0936c5b500 100644 --- a/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs +++ b/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs @@ -1,4 +1,4 @@ -// +// // CodeBehind.cs: // // Authors: @@ -41,6 +41,7 @@ using MonoDevelop.Ide.TypeSystem; using MonoDevelop.Projects; using MonoDevelop.AspNet.Projects; using Microsoft.CodeAnalysis; +using MonoDevelop.Ide; namespace MonoDevelop.AspNet.WebForms { @@ -75,8 +76,7 @@ namespace MonoDevelop.AspNet.WebForms var result = new BuildResult (); //parse the ASP.NET file - var parsedDocument = TypeSystemService.ParseFile (project, file.FilePath).Result as WebFormsParsedDocument; - if (parsedDocument == null) { + if (!(IdeApp.TypeSystemService.ParseFile (project, file.FilePath).Result is WebFormsParsedDocument parsedDocument)) { result.AddError (GettextCatalog.GetString ("Failed to parse file '{0}'", file.Name)); return result; } @@ -155,7 +155,7 @@ namespace MonoDevelop.AspNet.WebForms ProjectFile resolvedMaster = ext.ResolveVirtualPath (document.Info.MasterPageTypeVPath, document.FileName); WebFormsParsedDocument masterParsedDocument = null; if (resolvedMaster != null) - masterParsedDocument = TypeSystemService.ParseFile (project, resolvedMaster.FilePath).Result as WebFormsParsedDocument; + masterParsedDocument = IdeApp.TypeSystemService.ParseFile (project, resolvedMaster.FilePath).Result as WebFormsParsedDocument; if (masterParsedDocument != null && !String.IsNullOrEmpty (masterParsedDocument.Info.InheritedClass)) masterTypeName = masterParsedDocument.Info.InheritedClass; } catch (Exception ex) { diff --git a/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs b/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs index 4e998fe458..3c71dc3311 100644 --- a/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs +++ b/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs @@ -1,4 +1,4 @@ -//
+//
// CodeBehindTypeNameCache.cs
//
// Author:
@@ -46,7 +46,7 @@ namespace MonoDevelop.AspNet.WebForms protected override string GenerateInfo (string filename) { try { - var doc = TypeSystemService.ParseFile (null, filename, DesktopService.GetMimeTypeForUri (filename), StringTextSource.ReadFrom (filename)).Result as WebFormsParsedDocument; + var doc = IdeApp.TypeSystemService.ParseFile (null, filename, IdeServices.DesktopService.GetMimeTypeForUri (filename), StringTextSource.ReadFrom (filename)).Result as WebFormsParsedDocument; if (doc != null && !string.IsNullOrEmpty (doc.Info.InheritedClass)) return doc.Info.InheritedClass; } catch (Exception ex) { diff --git a/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs b/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs index 894620927c..8d92348dca 100644 --- a/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs +++ b/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs @@ -1,4 +1,4 @@ -// +// // DocumentReferenceManager.cs: Handles web type lookups for ASP.NET documents. // // Authors: @@ -47,6 +47,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using System.Threading; using System.Threading.Tasks; +using MonoDevelop.Ide; namespace MonoDevelop.AspNet.WebForms { @@ -382,7 +383,7 @@ namespace MonoDevelop.AspNet.WebForms var references = new HashSet<MetadataReference> (); if (project != null) { - var result = await TypeSystemService.GetCompilationAsync (project, token); + var result = await IdeApp.TypeSystemService.GetCompilationAsync (project, token); if (result != null) references.Add (result.ToMetadataReference ()); } @@ -439,7 +440,7 @@ namespace MonoDevelop.AspNet.WebForms var p = reference.ResolveProject (project.ParentSolution) as DotNetProject; if (p == null) continue; - var result = await TypeSystemService.GetCompilationAsync (p); + var result = await IdeApp.TypeSystemService.GetCompilationAsync (p); if (result != null) { return result.ToMetadataReference (); } @@ -452,7 +453,7 @@ namespace MonoDevelop.AspNet.WebForms MetadataReference LoadMetadataReference (string path) { - var roslynProject = TypeSystemService.GetProject (Project); + var roslynProject = IdeApp.TypeSystemService.GetProject (Project); var workspace = (MonoDevelopWorkspace)roslynProject.Solution.Workspace; var reference = workspace.MetadataReferenceManager.GetOrCreateMetadataReferenceSnapshot (path, MetadataReferenceProperties.Assembly); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs index e17aa98492..d4f471de04 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs @@ -1,4 +1,4 @@ -// +// // ClassOutlineTextEditorExtension.cs // // Author: @@ -113,7 +113,7 @@ namespace MonoDevelop.CSharp.ClassOutline outlineTreeModelSort = new TreeModelSort (outlineTreeStore); settings = OutlineSettings.Load (); - comparer = new OutlineNodeComparer (new AstAmbience (TypeSystemService.Workspace.Options), settings, outlineTreeModelSort); + comparer = new OutlineNodeComparer (new AstAmbience (IdeApp.TypeSystemService.Workspace.Options), settings, outlineTreeModelSort); outlineTreeModelSort.SetSortFunc (0, comparer.CompareNodes); outlineTreeModelSort.SetSortColumnId (0, SortType.Ascending); @@ -192,7 +192,7 @@ namespace MonoDevelop.CSharp.ClassOutline using (var dialog = new OutlineSortingPreferencesDialog (settings)) { if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog) == (int)Gtk.ResponseType.Ok) { dialog.SaveSettings (); - comparer = new OutlineNodeComparer (new AstAmbience (TypeSystemService.Workspace.Options), settings, outlineTreeModelSort); + comparer = new OutlineNodeComparer (new AstAmbience (IdeApp.TypeSystemService.Workspace.Options), settings, outlineTreeModelSort); UpdateSorting (); } } @@ -245,7 +245,7 @@ namespace MonoDevelop.CSharp.ClassOutline static void OutlineTreeTextFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter) { - var astAmbience = new AstAmbience (TypeSystemService.Workspace.Options); + var astAmbience = new AstAmbience (IdeApp.TypeSystemService.Workspace.Options); var txtRenderer = (CellRendererText)cell; object o = model.GetValue (iter, 0); var syntaxNode = o as SyntaxNode; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs index 5759abcfda..15394c220b 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs @@ -1,4 +1,4 @@ -// +// // CodeGenerationOptions.cs // // Author: @@ -88,7 +88,7 @@ namespace MonoDevelop.CodeGeneration { get { - return DesktopService.GetMimeTypeForUri (DocumentContext.Name); + return IdeServices.DesktopService.GetMimeTypeForUri (DocumentContext.Name); } } @@ -135,7 +135,7 @@ namespace MonoDevelop.CodeGeneration public async Task<string> OutputNode (SyntaxNode node, CancellationToken cancellationToken = default(CancellationToken)) { var options = await DocumentContext.GetOptionsAsync (cancellationToken); - node = Formatter.Format (node, TypeSystemService.Workspace, options, cancellationToken); + node = Formatter.Format (node, IdeApp.TypeSystemService.Workspace, options, cancellationToken); var text = Editor.Text; string nodeText = node.ToString (); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs index 7a16325db0..eff78dbfda 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs @@ -1,4 +1,4 @@ -// +// // GenerateCodeWindow.cs // // Author: @@ -138,7 +138,7 @@ namespace MonoDevelop.CodeGeneration GetSize (out w, out h); int myMonitor = Screen.GetMonitorAtPoint (x, y); - Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, myMonitor); + Xwt.Rectangle geometry = IdeServices.DesktopService.GetUsableMonitorGeometry (Screen.Number, myMonitor); if (x + w > geometry.Right) x = (int)geometry.Right - w; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs index 614772c1a5..1835f10242 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs @@ -109,7 +109,7 @@ namespace MonoDevelop.CSharp.Completion public CSharpFormattingPolicy FormattingPolicy { get { if (policy == null) { - IEnumerable<string> types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType); + IEnumerable<string> types = MonoDevelop.Ide.IdeServices.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType); policy = DocumentContext.GetPolicy<CSharpFormattingPolicy> (types); } return policy; @@ -133,7 +133,7 @@ namespace MonoDevelop.CSharp.Completion /// Used in testing environment. /// </summary> [System.ComponentModel.Browsable (false)] - public CSharpCompletionTextEditorExtension (MonoDevelop.Ide.Gui.Document doc, bool addEventHandlersInInitialization = true) + public CSharpCompletionTextEditorExtension (Ide.Gui.RoslynDocumentContext doc, bool addEventHandlersInInitialization = true) { this.addEventHandlersInInitialization = addEventHandlersInInitialization; Initialize (doc.Editor, doc); @@ -700,7 +700,7 @@ namespace MonoDevelop.CSharp.Completion } internal static Lazy<ImmutableArray<ISignatureHelpProvider>> signatureProviders = new Lazy<ImmutableArray<ISignatureHelpProvider>> (() => { - var workspace = TypeSystemService.Workspace; + var workspace = IdeApp.TypeSystemService.Workspace; var mefExporter = (IMefHostExportProvider)workspace.Services.HostServices; var helpProviders = mefExporter.GetExports<ISignatureHelpProvider, LanguageMetadata> () .FilterToSpecificLanguage (LanguageNames.CSharp); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs index e183311318..82876359b6 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs @@ -1,4 +1,4 @@ -// +// // ImportSymbolCompletionData.cs // // Author: @@ -37,6 +37,7 @@ using MonoDevelop.Ide.Editor.Highlighting; using MonoDevelop.Ide.Fonts; using System.Linq; using Microsoft.CodeAnalysis.Shared.Utilities; +using MonoDevelop.Ide; namespace MonoDevelop.CSharp.Completion { @@ -217,7 +218,7 @@ namespace MonoDevelop.CSharp.Completion } else { markup.AppendTaggedText (theme, taggedParts.Take (i)); markup.Append ("<span font='"); - markup.Append (FontService.SansFontName); + markup.Append (IdeServices.FontService.SansFontName); markup.Append ("' size='small'>"); markup.AppendLine (); markup.AppendLine (); @@ -227,7 +228,7 @@ namespace MonoDevelop.CSharp.Completion markup.AppendLine (); markup.AppendLine (); markup.Append ("<span font='"); - markup.Append (FontService.SansFontName); + markup.Append (IdeServices.FontService.SansFontName); markup.Append ("' size='small'>"); markup.AppendLine (GettextCatalog.GetString ("Note: creates an using for namespace:")); markup.Append ("<b>"); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs index b0ede48cdd..c8e99eb7d9 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs @@ -1,4 +1,4 @@ -// +// // CSharpFormattingProfileDialog.cs // // Author: @@ -666,7 +666,7 @@ namespace MonoDevelop.CSharp.Formatting text = ""; } - var types = DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType); + var types = IdeServices.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType); var textPolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> (types); texteditor.Text = CSharpFormatter.FormatText (profile.CreateOptions (textPolicy), text, 0, text.Length); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs index b86f5c234f..fb767402d0 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs @@ -1,4 +1,4 @@ -// +// // CSharpTextEditorIndentation.cs // // Author: @@ -58,7 +58,7 @@ namespace MonoDevelop.CSharp.Formatting internal ICSharpCode.NRefactory6.CSharp.CacheIndentEngine stateTracker; int cursorPositionBeforeKeyPress; - readonly static IEnumerable<string> types = DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType); + readonly static IEnumerable<string> types = IdeServices.DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType); char lastCharInserted; @@ -842,7 +842,7 @@ namespace MonoDevelop.CSharp.Formatting public void FormatBuffer () { Console.WriteLine ("format buffer!"); - ITypeResolveContext dom = TypeSystemService.GetProjectDom (Document.Project); + ITypeResolveContext dom = IdeApp.TypeSystemService.GetProjectDom (Document.Project); OnTheFlyFormatter.Format (this.textEditorData, dom); }*/ } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormattingPanel.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormattingPanel.cs index e9eb0bfdae..989829d728 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormattingPanel.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormattingPanel.cs @@ -37,6 +37,7 @@ using MonoDevelop.Ide.TypeSystem; using Microsoft.CodeAnalysis.Editor.Shared.Options; using Microsoft.CodeAnalysis; using System; +using MonoDevelop.Ide; namespace MonoDevelop.SourceEditor.OptionPanels { @@ -71,7 +72,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels public OnTheFlyFormattingPanelWidget () { - OptionService = TypeSystemService.Workspace.Services.GetService<IOptionService> (); + OptionService = IdeApp.TypeSystemService.Workspace.Services.GetService<IOptionService> (); formatOnTypeCheckBox = new CheckBox (GettextCatalog.GetString ("Automatically format when typing")); formatOnTypeCheckBox.Active = OptionService.GetOption (FeatureOnOffOptions.AutoFormattingOnTyping, LanguageNames.CSharp); formatOnTypeCheckBox.Toggled += FormatOnTypeCheckBox_Toggled; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs index 702d6013c4..a8c7f2c205 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs @@ -87,7 +87,7 @@ namespace MonoDevelop.CSharp.Highlighting } var old = Editor.SyntaxHighlighting as TagBasedSyntaxHighlighting; if (old == null) { - Editor.SyntaxHighlighting = CompositionManager.GetExportedValue<ITagBasedSyntaxHighlightingFactory> ().CreateSyntaxHighlighting (Editor.TextView, "source.cs"); + Editor.SyntaxHighlighting = CompositionManager.Instance.GetExportedValue<ITagBasedSyntaxHighlightingFactory> ().CreateSyntaxHighlighting (Editor.TextView, "source.cs"); } } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs index fc4b40b1c8..e5a564c44c 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs @@ -48,7 +48,7 @@ namespace MonoDevelop.CSharp.OptionProvider var mdws = document.Project.Solution.Workspace as MonoDevelopWorkspace; var project = mdws?.GetMonoProject (document.Project.Id); - var types = Ide.DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType); + var types = Ide.IdeServices.DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType); CSharpFormattingPolicy policy; TextStylePolicy textpolicy; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs index 8ac0e2c89d..9d0b4728bd 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs @@ -1,4 +1,4 @@ -// +// // TypeSystemParser.cs // // Author: @@ -33,6 +33,7 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis; using System.Threading.Tasks; +using MonoDevelop.Ide; namespace MonoDevelop.CSharp.Parser { @@ -56,9 +57,9 @@ namespace MonoDevelop.CSharp.Parser if (project != null) { var curDoc = options.RoslynDocument; if (curDoc == null) { - var curProject = TypeSystemService.GetCodeAnalysisProject (project); + var curProject = IdeApp.TypeSystemService.GetCodeAnalysisProject (project); if (curProject != null) { - var documentId = TypeSystemService.GetDocumentId (project, fileName); + var documentId = IdeApp.TypeSystemService.GetDocumentId (project, fileName); if (documentId != null) curDoc = curProject.GetDocument (documentId); } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs index eecaeb2247..4b12ce6b09 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs @@ -1,4 +1,4 @@ -// +// // CSharpCompilerParameters.cs // // Author: @@ -35,6 +35,7 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Host; using MonoDevelop.Core; using MonoDevelop.Core.Serialization; +using MonoDevelop.Ide; using MonoDevelop.Projects; namespace MonoDevelop.CSharp.Project @@ -127,7 +128,7 @@ namespace MonoDevelop.CSharp.Project public override CompilationOptions CreateCompilationOptions () { var project = (CSharpProject)ParentProject; - var workspace = Ide.TypeSystem.TypeSystemService.GetWorkspace (project.ParentSolution); + var workspace = IdeApp.TypeSystemService.GetWorkspace (project.ParentSolution); var metadataReferenceResolver = CreateMetadataReferenceResolver ( workspace.Services.GetService<IMetadataService> (), project.BaseDirectory, @@ -162,7 +163,7 @@ namespace MonoDevelop.CSharp.Project foreach (var warning in GetSuppressedWarnings ()) result [warning] = ReportDiagnostic.Suppress; - var globalRuleSet = Ide.TypeSystem.TypeSystemService.RuleSetManager.GetGlobalRuleSet (); + var globalRuleSet = IdeApp.TypeSystemService.RuleSetManager.GetGlobalRuleSet (); if (globalRuleSet != null) { foreach (var kv in globalRuleSet.SpecificDiagnosticOptions) { result [kv.Key] = kv.Value; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs index 3180358615..c913ccb999 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs @@ -1,4 +1,4 @@ -// +// // CompilerOptionsPanelWidget.cs // // Author: @@ -231,7 +231,7 @@ namespace MonoDevelop.CSharp.Project void FillClasses ()
{
try { - var ctx = TypeSystemService.GetCompilationAsync (project).Result; + var ctx = IdeApp.TypeSystemService.GetCompilationAsync (project).Result; if (ctx == null) // Project not found in parser database return; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs index e4d8895043..4d8767e966 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs @@ -1,4 +1,4 @@ -// +// // RenameTextEditorExtension.cs // // Author: @@ -47,7 +47,7 @@ namespace MonoDevelop.CSharp.Refactoring static CSharpFeaturesTextEditorExtension () { GoToDefinitionService.TryNavigateToSymbol = delegate (ISymbol symbol, Microsoft.CodeAnalysis.Project project, bool usePreviewTab) { - RefactoringService.RoslynJumpToDeclaration (symbol, TypeSystemService.GetMonoProject (project)); + RefactoringService.RoslynJumpToDeclaration (symbol, IdeApp.TypeSystemService.GetMonoProject (project)); return true; }; @@ -59,11 +59,11 @@ namespace MonoDevelop.CSharp.Refactoring var offset = textSpan.Start; string projectedName; int projectedOffset; - if (TypeSystemService.GetWorkspace (TypeSystemService.GetMonoProject(project).ParentSolution).TryGetOriginalFileFromProjection (fileName, offset, out projectedName, out projectedOffset)) { + if (IdeApp.TypeSystemService.GetWorkspace (IdeApp.TypeSystemService.GetMonoProject(project).ParentSolution).TryGetOriginalFileFromProjection (fileName, offset, out projectedName, out projectedOffset)) { fileName = projectedName; offset = projectedOffset; } - IdeApp.Workbench.OpenDocument (new FileOpenInformation (fileName, TypeSystemService.GetMonoProject (project)) { + IdeApp.Workbench.OpenDocument (new FileOpenInformation (fileName, IdeApp.TypeSystemService.GetMonoProject (project)) { Offset = offset }); return true; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferenceUsagesProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferenceUsagesProvider.cs index e122884435..4ff5a22672 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferenceUsagesProvider.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferenceUsagesProvider.cs @@ -46,7 +46,7 @@ namespace MonoDevelop.CSharp.Refactoring var currentProject = IdeApp.ProjectOperations.CurrentSelectedProject; if (currentProject == null) return; - var analysisProject = TypeSystemService.GetCodeAnalysisProject (currentProject); + var analysisProject = IdeApp.TypeSystemService.GetCodeAnalysisProject (currentProject); if (analysisProject == null) return; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferencesProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferencesProvider.cs index 2afc3b68ac..bd256c87ff 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferencesProvider.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferencesProvider.cs @@ -1,4 +1,4 @@ -// +// // CSharpFindReferencesProvider.cs // // Author: @@ -118,7 +118,7 @@ namespace MonoDevelop.CSharp.Refactoring LookupResult result = LookupResult.Failure; if (hintProject != null) { - codeAnalysisHintProject = TypeSystemService.GetCodeAnalysisProject (hintProject); + codeAnalysisHintProject = IdeApp.TypeSystemService.GetCodeAnalysisProject (hintProject); if (codeAnalysisHintProject != null) { var curResult = await TryLookupSymbolInProject (codeAnalysisHintProject, documentationCommentId, token); if (curResult.Success) { @@ -129,13 +129,13 @@ namespace MonoDevelop.CSharp.Refactoring } if (result.Success && result.Symbol.IsDefinedInSource ()) return result; - foreach (var ws in TypeSystemService.AllWorkspaces) { + foreach (var ws in IdeApp.TypeSystemService.AllWorkspaces) { foreach (var prj in ws.CurrentSolution.Projects) { if (prj == codeAnalysisHintProject) continue; var curResult = await TryLookupSymbolInProject (prj, documentationCommentId, token); if (curResult.Success) { - curResult.MonoDevelopProject = TypeSystemService.GetMonoProject (prj); + curResult.MonoDevelopProject = IdeApp.TypeSystemService.GetMonoProject (prj); if (curResult.Symbol.IsDefinedInSource ()) return curResult; result = curResult; @@ -209,7 +209,7 @@ namespace MonoDevelop.CSharp.Refactoring if (lookup == null || !lookup.Success) return; - var workspace = TypeSystemService.AllWorkspaces.FirstOrDefault (w => w.CurrentSolution == lookup.Solution) as MonoDevelopWorkspace; + var workspace = IdeApp.TypeSystemService.AllWorkspaces.FirstOrDefault (w => w.CurrentSolution == lookup.Solution) as MonoDevelopWorkspace; if (workspace == null) return; @@ -233,7 +233,7 @@ namespace MonoDevelop.CSharp.Refactoring var lookup = await TryLookupSymbol (documentationCommentId, hintProject, monitor.CancellationToken); if (!lookup.Success) return; - var workspace = TypeSystemService.AllWorkspaces.FirstOrDefault (w => w.CurrentSolution == lookup.Solution) as MonoDevelopWorkspace; + var workspace = IdeApp.TypeSystemService.AllWorkspaces.FirstOrDefault (w => w.CurrentSolution == lookup.Solution) as MonoDevelopWorkspace; if (workspace == null) return; if (lookup.Symbol.Kind == SymbolKind.Method) { diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs index bf8193b236..5f897a1eab 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs @@ -1,4 +1,4 @@ -// +// // HelperMethods.cs // // Author: @@ -90,7 +90,7 @@ namespace MonoDevelop.CSharp internal static MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy GetFormattingPolicy (this DocumentContext doc) { var policyParent = doc?.Project?.Policies; - var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType); + var types = MonoDevelop.Ide.IdeServices.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType); var codePolicy = policyParent != null ? policyParent.Get<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types) : MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types); return codePolicy; } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs index f64f56e204..54968ba2a0 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs @@ -85,7 +85,7 @@ namespace MonoDevelop.SourceEditor var formatter = ctx.RoslynWorkspace.Services.GetLanguageServices (model.Language).GetService<IDocumentationCommentFormattingService> (); var documentation = symbol.GetDocumentationParts (model, caretOffset, formatter, cancellationToken); sb.Append ("<span font='"); - sb.Append (FontService.SansFontName); + sb.Append (IdeServices.FontService.SansFontName); sb.Append("' size='small'>"); if (documentation != null && documentation.Any ()) { diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs index 8ddbd4399b..c06262560a 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs @@ -23,13 +23,10 @@ // 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 MonoDevelop.UnitTesting; -using MonoDevelop.Ide.TypeSystem; -using System.Threading; using Microsoft.CodeAnalysis; using System.Linq; -using MonoDevelop.Projects; +using MonoDevelop.Ide; namespace MonoDevelop.CSharp.UnitTests { @@ -37,7 +34,7 @@ namespace MonoDevelop.CSharp.UnitTests { public override async System.Threading.Tasks.Task<SourceCodeLocation> GetSourceCodeLocationAsync (MonoDevelop.Projects.Project project, string fixtureTypeNamespace, string fixtureTypeName, string testName, System.Threading.CancellationToken cancellationToken) { - var ctx = await TypeSystemService.GetCompilationAsync (project, cancellationToken).ConfigureAwait (false); + var ctx = await IdeApp.TypeSystemService.GetCompilationAsync (project, cancellationToken).ConfigureAwait (false); var cls = ctx?.Assembly?.GetTypeByMetadataName (string.IsNullOrEmpty (fixtureTypeNamespace) ? fixtureTypeName : fixtureTypeNamespace + "." + fixtureTypeName); if (cls == null) return null; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs index 3fc792ccb1..25a7535243 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs @@ -1,4 +1,4 @@ -// +// // SignatureMarkupCreator.cs // // Author: @@ -85,7 +85,7 @@ namespace MonoDevelop.CSharp if (ctx != null) { this.options = ctx.GetOptionSet (); } else { - this.options = MonoDevelop.Ide.TypeSystem.TypeSystemService.Workspace.Options; + this.options = IdeApp.TypeSystemService.Workspace.Options; } } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MonoDevelopContainedDocument.cs b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MonoDevelopContainedDocument.cs index 080d9909c8..3fdf6de173 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MonoDevelopContainedDocument.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MonoDevelopContainedDocument.cs @@ -77,7 +77,7 @@ namespace MonoDevelop.Ide.Completion.Presentation DataBuffer = dataBuffer;
ContainedLanguageHost = containedLanguageHost;
- _differenceSelectorService = CompositionManager.GetExportedValue<ITextDifferencingSelectorService> ();
+ _differenceSelectorService = CompositionManager.Instance.GetExportedValue<ITextDifferencingSelectorService> ();
var container = languageBuffer.CurrentSnapshot.AsText ().Container;
var registration = Workspace.GetWorkspaceRegistration (container);
@@ -601,7 +601,7 @@ namespace MonoDevelop.Ide.Completion.Presentation var root = document.GetSyntaxRootSynchronously (CancellationToken.None);
- var editorOptionsFactory = CompositionManager.GetExportedValue<IEditorOptionsFactoryService> ();
+ var editorOptionsFactory = CompositionManager.Instance.GetExportedValue<IEditorOptionsFactoryService> ();
var editorOptions = editorOptionsFactory.GetOptions (DataBuffer);
var options = _workspace.Options
.WithChangedOption (FormattingOptions.NewLine, root.Language, editorOptions.GetNewLineCharacter ())
@@ -708,7 +708,7 @@ namespace MonoDevelop.Ide.Completion.Presentation private int GetBaseIndentation (SyntaxNode root, SourceText text, TextSpan span)
{
// Is this right? We should probably get this from the IVsContainedLanguageHost instead.
- var editorOptionsFactory = CompositionManager.GetExportedValue<IEditorOptionsFactoryService> ();
+ var editorOptionsFactory = CompositionManager.Instance.GetExportedValue<IEditorOptionsFactoryService> ();
var editorOptions = editorOptionsFactory.GetOptions (DataBuffer);
var additionalIndentation = GetAdditionalIndentation (root, text, span);
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs index dc90bb5ca3..3de86b229c 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs @@ -174,7 +174,7 @@ namespace MonoDevelop.Ide.Completion.Presentation else { markup.AppendTaggedText (theme, taggedParts.Take (i)); markup.Append ("<span font='");
- markup.Append (FontService.SansFontName);
+ markup.Append (IdeServices.FontService.SansFontName);
markup.Append ("' size='small'>"); markup.AppendLine (); markup.AppendLine (); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCommandTarget.cs b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCommandTarget.cs index 277808578b..b0de1928e7 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCommandTarget.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCommandTarget.cs @@ -26,13 +26,13 @@ namespace MonoDevelop.Ide.Completion.Presentation private RoslynCommandTarget (ITextView textView, ITextBuffer languageBuffer)
{
- var commandHandlerServiceFactory = CompositionManager.GetExportedValue<ICommandHandlerServiceFactory> ();
+ var commandHandlerServiceFactory = CompositionManager.Instance.GetExportedValue<ICommandHandlerServiceFactory> ();
if (commandHandlerServiceFactory != null) {
commandHandlerServiceFactory.Initialize (languageBuffer.ContentType.TypeName);
CurrentRoslynHandlers = commandHandlerServiceFactory.GetService (languageBuffer);
}
- var editorCommandHandlerServiceFactory = CompositionManager.GetExportedValue<IEditorCommandHandlerServiceFactory> ();
+ var editorCommandHandlerServiceFactory = CompositionManager.Instance.GetExportedValue<IEditorCommandHandlerServiceFactory> ();
if (editorCommandHandlerServiceFactory != null) {
CurrentEditorHandlers = editorCommandHandlerServiceFactory.GetService (textView, languageBuffer);
}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCompletionPresenterSession.View.cs b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCompletionPresenterSession.View.cs index 186b99e92d..952ffca7cd 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCompletionPresenterSession.View.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCompletionPresenterSession.View.cs @@ -1,4 +1,4 @@ -// +// // RoslynCompletionPresenterSession.View.cs // // Author: @@ -83,8 +83,8 @@ namespace MonoDevelop.Ide.Completion.Presentation if (noMatchFont != null) noMatchFont.Dispose (); - itemFont = FontService.MonospaceFont.Copy (); - noMatchFont = FontService.SansFont.CopyModified (Styles.FontScale11); + itemFont = IdeServices.FontService.MonospaceFont.Copy (); + noMatchFont = IdeServices.FontService.SansFont.CopyModified (Styles.FontScale11); var newItemFontSize = itemFont.Size; var newNoMatchFontSize = noMatchFont.Size; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs index f9faf73db8..2456c2ef95 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs @@ -46,13 +46,13 @@ namespace MonoDevelop.JSon // This extension needs to be turned off if the webtooling addin json extension is present. // That addin defines a "text/x-json" mimeType that has multiple levels of inheritance. - var mimeChain = DesktopService.GetMimeTypeInheritanceChain("text/x-json").ToList(); + var mimeChain = IdeServices.DesktopService.GetMimeTypeInheritanceChain("text/x-json").ToList(); jsonExtensionInstalled = (mimeChain.Count > 2); if (!jsonExtensionInstalled)
{
IStateMachineIndentEngine indentEngine;
- indentEngine = new JSonIndentEngine(Editor, DocumentContext);
+ indentEngine = new JSonIndentEngine(Editor);
stateTracker = new CacheIndentEngine(indentEngine);
Editor.IndentationTracker = new JSonIndentationTracker(Editor, stateTracker);
}
diff --git a/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs b/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs index 46985bc20e..8611a4ee2b 100644 --- a/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs +++ b/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs @@ -1,4 +1,4 @@ -// AddLogEntryDialog.cs +// AddLogEntryDialog.cs // // Author: // Lluis Sanchez Gual @@ -47,7 +47,7 @@ namespace MonoDevelop.ChangeLogAddIn { Build (); - textview.ModifyFont (FontService.MonospaceFont); + textview.ModifyFont (IdeServices.FontService.MonospaceFont); textview.WrapMode = WrapMode.None; textview.AcceptsTab = true; Pango.TabArray tabs = new Pango.TabArray (1, true); diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs index e272ee6c9b..9a877796cb 100644 --- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs +++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs @@ -112,7 +112,7 @@ namespace MonoDevelop.ChangeLogAddIn var textBuffer = document.Editor; if (textBuffer == null) return false; - AuthorInformation userInfo = document.Project != null ? document.Project.AuthorInformation : AuthorInformation.Default; + AuthorInformation userInfo = document.Owner is SolutionFolderItem item ? item.AuthorInformation : AuthorInformation.Default; if (!userInfo.IsValid) { string title = GettextCatalog.GetString ("ChangeLog entries can't be generated"); @@ -163,7 +163,7 @@ namespace MonoDevelop.ChangeLogAddIn if (File.Exists (clog)) return await IdeApp.Workbench.OpenDocument (clog, (Project) null, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer); - Document document = IdeApp.Workbench.NewDocument (clog, "text/plain", ""); + Document document = await IdeApp.Workbench.NewDocument (clog, "text/plain", ""); //it doesn't need to be saved to start using it document.Save().Ignore (); return document; diff --git a/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs index b6eeaf6721..bfeadec001 100644 --- a/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs +++ b/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs @@ -1,4 +1,4 @@ -// +// // MacSelectFileDialogHandler.cs // // Author: @@ -51,7 +51,7 @@ namespace MonoDevelop.MacIntegration { using (var panel = CreatePanel (data, out NSPopUpButton popup)) { if (panel.RunModal () == 0) { - DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); + IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); return false; } @@ -61,7 +61,7 @@ namespace MonoDevelop.MacIntegration if (idx >= 0) data.OverrideAction = data.BuildActions[idx]; - DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); + IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); return true; } } diff --git a/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs index 4d5f508c9d..4295e92e49 100644 --- a/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs +++ b/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs @@ -1,4 +1,4 @@ -// +// // MacAlertFileDialogHandler.cs // // Author: @@ -187,7 +187,7 @@ namespace MonoDevelop.MacIntegration var sheet = IdeTheme.UserInterfaceTheme != Theme.Dark || MacSystemInformation.OsVersion != MacSystemInformation.HighSierra; // We have an issue with accessibility when using sheets, so disable it here - sheet &= !DesktopService.AccessibilityInUse; + sheet &= !IdeServices.DesktopService.AccessibilityInUse; if (!sheet || nativeParent == null) { // Force the alert window to be focused for accessibility @@ -240,7 +240,7 @@ namespace MonoDevelop.MacIntegration if (nativeParent != null) nativeParent.MakeKeyAndOrderFront (nativeParent); else - DesktopService.FocusWindow (parent); + IdeServices.DesktopService.FocusWindow (parent); } diff --git a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs index 3bb885f020..9bb2ede4a0 100644 --- a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs +++ b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs @@ -1,4 +1,4 @@ -// +// // MacSelectFileDialogHandler.cs // // Author: @@ -108,7 +108,7 @@ namespace MonoDevelop.MacIntegration }; if (panel.RunModal () == 0 && !pathAlreadySet) { - DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); + IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); return false; } if (!pathAlreadySet) @@ -124,7 +124,7 @@ namespace MonoDevelop.MacIntegration state.CurrentViewers [(int)state.ViewerSelector.IndexOfSelectedItem] : null; } - DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); + IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); } } catch (Exception ex) { LoggingService.LogInternalError ("Error in Open File dialog", ex); @@ -207,7 +207,7 @@ namespace MonoDevelop.MacIntegration int i = 0; bool hasWorkbenchViewer = false; - if (IdeApp.Services.ProjectService.IsWorkspaceItemFile (filename) || IdeApp.Services.ProjectService.IsSolutionItemFile (filename)) { + if (IdeServices.ProjectService.IsWorkspaceItemFile (filename) || IdeServices.ProjectService.IsSolutionItemFile (filename)) { button.Menu.AddItem (new NSMenuItem { Title = GettextCatalog.GetString ("Solution Workbench") }); currentViewers.Add (null); @@ -220,7 +220,7 @@ namespace MonoDevelop.MacIntegration i++; } - foreach (var vw in DisplayBindingService.GetFileViewers (filename, null)) { + foreach (var vw in IdeServices.DisplayBindingService.GetFileViewers (filename, null).Result) { if (!vw.IsExternal) { button.Menu.AddItem (new NSMenuItem { Title = vw.Title }); currentViewers.Add (vw); diff --git a/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs index 014a4e4fd8..a4f935fb76 100644 --- a/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs +++ b/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs @@ -1,4 +1,4 @@ -// +// // MacSelectFileDialogHandler.cs // // Author: @@ -61,12 +61,12 @@ namespace MonoDevelop.MacIntegration { using (var panel = CreatePanel (data, out var saveState)) { if (panel.RunModal () == 0) { - DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); + IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); return false; } data.SelectedFiles = GetSelectedFiles (panel); - DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); + IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow); return true; } } @@ -105,9 +105,9 @@ namespace MonoDevelop.MacIntegration return true; if (mimetypes != null) { - var mimetype = DesktopService.GetMimeTypeForUri (path); + var mimetype = IdeServices.DesktopService.GetMimeTypeForUri (path); if (mimetype != null) { - var chain = DesktopService.GetMimeTypeInheritanceChain (mimetype); + var chain = IdeServices.DesktopService.GetMimeTypeInheritanceChain (mimetype); if (mimetypes.Any (m => chain.Any (c => c == m))) return true; } diff --git a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs index 45bf387c14..a07bde11ef 100644 --- a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs @@ -596,7 +596,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar updateHandler = delegate { int ec = 0, wc = 0; - foreach (var t in TaskService.Errors) { + foreach (var t in IdeServices.TaskService.Errors) { if (t.Severity == TaskSeverity.Error) ec++; else if (t.Severity == TaskSeverity.Warning) @@ -617,8 +617,8 @@ namespace MonoDevelop.MacIntegration.MainToolbar updateHandler (null, null); - TaskService.Errors.TasksAdded += updateHandler; - TaskService.Errors.TasksRemoved += updateHandler; + IdeServices.TaskService.Errors.TasksAdded += updateHandler; + IdeServices.TaskService.Errors.TasksRemoved += updateHandler; BrandingService.ApplicationNameChanged += ApplicationNameChanged; AddSubview (cancelButton); @@ -666,8 +666,8 @@ namespace MonoDevelop.MacIntegration.MainToolbar protected override void Dispose (bool disposing) { - TaskService.Errors.TasksAdded -= updateHandler; - TaskService.Errors.TasksRemoved -= updateHandler; + IdeServices.TaskService.Errors.TasksAdded -= updateHandler; + IdeServices.TaskService.Errors.TasksRemoved -= updateHandler; Ide.Gui.Styles.Changed -= LoadStyles; BrandingService.ApplicationNameChanged -= ApplicationNameChanged; base.Dispose (disposing); diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/PublishToFolderBaseCommandHandler.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/PublishToFolderBaseCommandHandler.cs index e112767335..1c14b8eafa 100644 --- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/PublishToFolderBaseCommandHandler.cs +++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/PublishToFolderBaseCommandHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Threading.Tasks; using System.IO; @@ -133,7 +133,7 @@ namespace MonoDevelop.AspNetCore.Commands } if (Directory.Exists (path)) - DesktopService.OpenFolder (path); + IdeServices.DesktopService.OpenFolder (path); else LoggingService.LogError ("Trying to open {0} but it does not exists.", path); } diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs index 8aa2b18a78..0cc0ca611e 100644 --- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs +++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs @@ -101,7 +101,7 @@ namespace MonoDevelop.AspNetCore } // Process is still alive hence we succesfully connected inside loop to web server, launch browser - DesktopService.ShowUrl (launchUri.AbsoluteUri); + IdeServices.DesktopService.ShowUrl (launchUri.AbsoluteUri); } } }
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Cecil/MethodDefinitionNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Cecil/MethodDefinitionNodeBuilder.cs index af8637f4d2..cd3e7a89a3 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Cecil/MethodDefinitionNodeBuilder.cs +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Cecil/MethodDefinitionNodeBuilder.cs @@ -1,4 +1,4 @@ -// +// // DomMethodNodeBuilder.cs // // Author: @@ -172,7 +172,7 @@ namespace MonoDevelop.AssemblyBrowser public static DecompilerSettings GetDecompilerSettings (TextEditor data, bool publicOnly = false) { - var types = DesktopService.GetMimeTypeInheritanceChain (data.MimeType); + var types = IdeServices.DesktopService.GetMimeTypeInheritanceChain (data.MimeType); var codePolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types); var settings = TypeDefinitionNodeBuilder.CreateDecompilerSettings (publicOnly, codePolicy); return settings; diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Roslyn/ProjectNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Roslyn/ProjectNodeBuilder.cs index eb776c4a9d..3615f5c8c6 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Roslyn/ProjectNodeBuilder.cs +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Roslyn/ProjectNodeBuilder.cs @@ -1,4 +1,4 @@ -// +// // ProjectNodeBuilder.cs // // Author: @@ -25,19 +25,13 @@ // THE SOFTWARE. using System; +using System.Collections.Generic; using System.Linq; -using System.Text; - -using Mono.Cecil; - using MonoDevelop.Core; -using MonoDevelop.Ide.Gui; -using MonoDevelop.Ide.Gui.Pads; +using MonoDevelop.Ide; using MonoDevelop.Ide.Gui.Components; -using System.Collections.Generic; -using System.IO; -using MonoDevelop.Projects; using MonoDevelop.Ide.TypeSystem; +using MonoDevelop.Projects; namespace MonoDevelop.AssemblyBrowser { @@ -75,7 +69,7 @@ namespace MonoDevelop.AssemblyBrowser { Project project = (Project)dataObject; bool publicOnly = Widget.PublicApiOnly; - var dom = TypeSystemService.GetCompilationAsync (project).Result; + var dom = IdeApp.TypeSystemService.GetCompilationAsync (project).Result; if (dom == null) return; bool nestedNamespaces = builder.Options ["NestedNamespaces"]; diff --git a/main/src/addins/MonoDevelop.ConnectedServices/CodeDependency.cs b/main/src/addins/MonoDevelop.ConnectedServices/CodeDependency.cs index a348358e9f..09434be1e9 100644 --- a/main/src/addins/MonoDevelop.ConnectedServices/CodeDependency.cs +++ b/main/src/addins/MonoDevelop.ConnectedServices/CodeDependency.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading; @@ -88,7 +88,7 @@ namespace MonoDevelop.ConnectedServices LoggingService.LogInfo ("Adding code dependency '{0}' to '{1}'...", this, this.Service.Project.Name); } - var compilation = await TypeSystemService.GetCompilationAsync (this.Service.Project).ConfigureAwait (false); + var compilation = await IdeApp.TypeSystemService.GetCompilationAsync (this.Service.Project).ConfigureAwait (false); if (compilation == null) { LoggingService.LogInternalError ("Could not get compilation object.", null); @@ -128,7 +128,7 @@ namespace MonoDevelop.ConnectedServices LoggingService.LogInfo ("Removing code dependency '{0}' from '{1}'...", this, this.Service.Project.Name); } - var compilation = await TypeSystemService.GetCompilationAsync (this.Service.Project).ConfigureAwait (false); + var compilation = await IdeApp.TypeSystemService.GetCompilationAsync (this.Service.Project).ConfigureAwait (false); if (compilation == null) { LoggingService.LogInternalError ("Could not get compilation object.", null); diff --git a/main/src/addins/MonoDevelop.ConnectedServices/CodeExtensions.cs b/main/src/addins/MonoDevelop.ConnectedServices/CodeExtensions.cs index 44382cc0f3..17da306510 100644 --- a/main/src/addins/MonoDevelop.ConnectedServices/CodeExtensions.cs +++ b/main/src/addins/MonoDevelop.ConnectedServices/CodeExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -8,6 +8,7 @@ using MonoDevelop.Core; using MonoDevelop.Projects.Text; using Microsoft.CodeAnalysis; using MonoDevelop.Ide.TypeSystem; +using MonoDevelop.Ide; namespace MonoDevelop.ConnectedServices { @@ -30,7 +31,7 @@ namespace MonoDevelop.ConnectedServices /// </summary> public static Microsoft.CodeAnalysis.Project GetCodeAnalysisProject (this MonoDevelop.Projects.Project monoDevelopProject) { - return TypeSystemService.GetCodeAnalysisProject (monoDevelopProject); + return IdeApp.TypeSystemService.GetCodeAnalysisProject (monoDevelopProject); } /// <summary> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs index bdb43ae3f9..030282437d 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs @@ -28,6 +28,7 @@ using MonoDevelop.Components; using Mono.Debugging.Client; using Gtk; using MonoDevelop.Ide.Fonts; +using MonoDevelop.Ide; namespace MonoDevelop.Debugger.PreviewVisualizers { @@ -68,7 +69,7 @@ namespace MonoDevelop.Debugger.PreviewVisualizers label = new Label (); label.Text = value; - label.ModifyFont (FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11)); + label.ModifyFont (IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11)); label.ModifyFg (StateType.Normal, col); label.SetPadding (4, 4); diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs index 34b7907cd6..1b11cb9cab 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs @@ -71,7 +71,7 @@ namespace MonoDevelop.Debugger var headerTitle = new Label (); headerTitle.ModifyFg (StateType.Normal, Styles.PreviewVisualizerHeaderTextColor.ToGdkColor ()); - var font = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale12); + var font = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale12); font.Weight = Pango.Weight.Bold; headerTitle.ModifyFont (font); headerTitle.Text = val.TypeName; diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs index 95244ddd75..57025d3dc2 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs @@ -1,4 +1,4 @@ -// +// // BreakpointsPropertiesDialog.cs // // Author: @@ -624,7 +624,7 @@ namespace MonoDevelop.Debugger var project = IdeApp.ProjectOperations.CurrentSelectedProject; if (project != null) { - var roslynProj = TypeSystemService.GetProject (project); + var roslynProj = IdeApp.TypeSystemService.GetProject (project); if (roslynProj != null) { workspace = (MonoDevelopWorkspace)roslynProj.Solution.Workspace; compilation = await roslynProj.GetCompilationAsync (); diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs index f852bfc07b..e4a233e40a 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs @@ -93,8 +93,8 @@ namespace MonoDevelop.Debugger static DebuggingService () { executionHandlerFactory = new DebugExecutionHandlerFactory (); - TextEditorService.LineCountChanged += OnLineCountChanged; IdeApp.Initialized += delegate { + IdeServices.TextEditorService.LineCountChanged += OnLineCountChanged; IdeApp.Workspace.StoringUserPreferences += OnStoreUserPrefs; IdeApp.Workspace.LoadingUserPreferences += OnLoadUserPrefs; IdeApp.Workspace.LastWorkspaceItemClosed += OnSolutionClosed; diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs index d3d79b584e..dc24c1e85b 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs @@ -1,4 +1,4 @@ -// +// // ExceptionCaughtDialog.cs // // Authors: Lluis Sanchez Gual <lluis@novell.com> @@ -116,7 +116,7 @@ widget ""*.exception_help_link_label"" style ""exception-help-link-label"" var textColor = Styles.ExceptionCaughtDialog.HeaderTextColor.ToGdkColor (); ExceptionHelpLinkLabel.ModifyBase (StateType.Prelight, Styles.ExceptionCaughtDialog.HeaderBackgroundColor.ToGdkColor ()); - ExceptionHelpLinkLabel.SetLinkHandler ((str) => DesktopService.ShowUrl (str)); + ExceptionHelpLinkLabel.SetLinkHandler ((str) => IdeServices.DesktopService.ShowUrl (str)); ExceptionTypeLabel.ModifyFg (StateType.Normal, textColor); ExceptionMessageLabel.ModifyFg (StateType.Normal, textColor); ExceptionHelpLinkLabel.ModifyFg (StateType.Normal, textColor); @@ -431,7 +431,7 @@ widget ""*.exception_dialog_expander"" style ""exception-dialog-expander"" InnerExceptionHelpLinkLabel.CanFocus = false; InnerExceptionHelpLinkLabel.Xalign = 0; InnerExceptionHelpLinkLabel.ModifyFont (Pango.FontDescription.FromString (Platform.IsWindows ? "9" : "11")); - InnerExceptionHelpLinkLabel.SetLinkHandler ((str) => DesktopService.ShowUrl (str)); + InnerExceptionHelpLinkLabel.SetLinkHandler ((str) => IdeServices.DesktopService.ShowUrl (str)); vboxAroundInnerExceptionMessage.PackStart (hbox, false, true, 0); vboxAroundInnerExceptionMessage.PackStart (InnerExceptionMessageLabel, true, true, 10); @@ -900,7 +900,7 @@ widget ""*.exception_dialog_expander"" style ""exception-dialog-expander"" } if (button == null) { button = new ExceptionCaughtButton (ex, this, File, Line); - TextEditorService.RegisterExtension (button); + IdeServices.TextEditorService.RegisterExtension (button); button.ScrollToView (); } if (miniButton != null) { @@ -922,7 +922,7 @@ widget ""*.exception_dialog_expander"" style ""exception-dialog-expander"" } if (miniButton == null) { miniButton = new ExceptionCaughtMiniButton (this, File, Line); - TextEditorService.RegisterExtension (miniButton); + IdeServices.TextEditorService.RegisterExtension (miniButton); miniButton.ScrollToView (); } } diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs index 8e5a2d7694..8bfca252ca 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs @@ -59,7 +59,7 @@ namespace MonoDevelop.Debugger } } - void OnFrameChanged (object s, EventArgs a) + async void OnFrameChanged (object s, EventArgs a) { if (disassemblyDoc != null && DebuggingService.IsFeatureSupported (DebuggerFeatures.Disassembly)) disassemblyView.Update (); @@ -104,7 +104,7 @@ namespace MonoDevelop.Debugger if (noSourceDoc == null) { noSourceView = new NoSourceView (); noSourceView.Update (disassemblyNotSupported); - noSourceDoc = IdeApp.Workbench.OpenDocument (noSourceView, true); + noSourceDoc = await IdeApp.Workbench.OpenDocument (noSourceView, true); noSourceDoc.Closed += delegate { noSourceDoc = null; noSourceView = null; @@ -118,11 +118,11 @@ namespace MonoDevelop.Debugger } } - void OnShowDisassembly (object s, EventArgs a) + async void OnShowDisassembly (object s, EventArgs a) { if (disassemblyDoc == null) { disassemblyView = new DisassemblyView (); - disassemblyDoc = IdeApp.Workbench.OpenDocument (disassemblyView, true); + disassemblyDoc = await IdeApp.Workbench.OpenDocument (disassemblyView, true); disassemblyDoc.Closed += delegate { disassemblyDoc = null; disassemblyView = null; diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs index 8a5fb4f50e..c2998c9c8b 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs @@ -1,4 +1,4 @@ -// ObjectValueTree.cs +// ObjectValueTree.cs // // Author: // Lluis Sanchez Gual <lluis@novell.com> @@ -165,7 +165,7 @@ namespace MonoDevelop.Debugger if (!icon.IsNull) { using (var ctx = Gdk.CairoHelper.Create (window)) { using (var layout = new Pango.Layout (widget.PangoContext)) { - layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); + layout.FontDescription = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); layout.FontDescription.Family = Family; layout.SetText (Text); int w, h; @@ -320,7 +320,7 @@ namespace MonoDevelop.Debugger Selection.Changed += HandleSelectionChanged; ResetColumnSizes (); - Pango.FontDescription newFont = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); + Pango.FontDescription newFont = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); liveIcon = ImageService.GetIcon ("md-live", IconSize.Menu); noLiveIcon = liveIcon.WithAlpha (0.5); @@ -769,11 +769,11 @@ namespace MonoDevelop.Debugger compact = value; Pango.FontDescription newFont; if (compact) { - newFont = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); + newFont = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); valueCol.MaxWidth = 800; crpViewer.Image = ImageService.GetIcon (Stock.Edit).WithSize (12,12); } else { - newFont = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale12); + newFont = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale12); valueCol.MaxWidth = int.MaxValue; } crtValue.Compact = compact; @@ -1946,7 +1946,7 @@ namespace MonoDevelop.Debugger Uri uri; if (url != null && Uri.TryCreate (url, UriKind.Absolute, out uri) && (uri.Scheme == "http" || uri.Scheme == "https")) { clickProcessed = true; - DesktopService.ShowUrl (url); + IdeServices.DesktopService.ShowUrl (url); } } } else if (cr == crtExp) { diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs index 5f7c6e4b34..6a08c70968 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs @@ -1,4 +1,4 @@ -// ProjectFileDescriptor.cs
+// ProjectFileDescriptor.cs
//
//Author:
// Lluis Sanchez Gual
@@ -90,8 +90,8 @@ namespace MonoDevelop.DesignerSupport [LocalizedDescription ("Type of the file.")]
public string FileType {
get {
- string type = DesktopService.GetMimeTypeForUri (file.Name);
- return DesktopService.GetMimeTypeDescription (type);
+ string type = IdeServices.DesktopService.GetMimeTypeForUri (file.Name);
+ return IdeServices.DesktopService.GetMimeTypeDescription (type);
}
}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs index e956cd6926..5d08cc734a 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs @@ -1,4 +1,4 @@ -// +// // BindingService.cs: Utility methods for binding CodeBehind members. // // Authors: @@ -167,7 +167,7 @@ namespace MonoDevelop.DesignerSupport // if (!isChildClass) // throw new ArgumentException ("Class specificPartToAffect is not a part of class cls"); // -// var dom = TypeSystemService.GetCompilation (project); +// var dom = IdeApp.TypeSystemService.GetCompilation (project); // var existingMember = GetCompatibleMemberInClass (dom, cls, member); // // if (existingMember == null) diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs index e3431daaa1..27d76ec90f 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs @@ -30,6 +30,7 @@ using System; using MonoDevelop.Components.Commands; using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; +using MonoDevelop.Ide.Gui.Shell; namespace MonoDevelop.DesignerSupport { diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependencyNodeCache.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependencyNodeCache.cs index fa111f74bb..ce1b18f47e 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependencyNodeCache.cs +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependencyNodeCache.cs @@ -88,7 +88,7 @@ namespace MonoDevelop.DotNetCore.NodeBuilders Task<List<PackageDependencyInfo>> GetPackageDependenciesAsync (CancellationTokenSource tokenSource) { - var configurationSelector = IdeApp.Workspace?.ActiveConfiguration ?? ConfigurationSelector.Default; + var configurationSelector = IdeApp.IsInitialized ? IdeApp.Workspace?.ActiveConfiguration ?? ConfigurationSelector.Default : ConfigurationSelector.Default; return Task.Run (async () => { var dependencies = await Project.GetPackageDependencies (configurationSelector, tokenSource.Token) .ConfigureAwait (false); diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs index 27bce95a3a..7a51d6a7f7 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs @@ -31,6 +31,8 @@ using MonoDevelop.Ide.Templates; using MonoDevelop.Projects; using NUnit.Framework; using IdeUnitTests; +using MonoDevelop.Ide; +using UnitTests; namespace MonoDevelop.DotNetCore.Tests { diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs index ce712637c2..01f0858897 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs @@ -101,7 +101,7 @@ namespace MonoDevelop.DotNetCore } // Process is still alive hence we succesfully connected inside loop to web server, launch browser - DesktopService.ShowUrl (launchUri.AbsoluteUri); + IdeServices.DesktopService.ShowUrl (launchUri.AbsoluteUri); } } }
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs index 044b397e07..cb28b6edc9 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs @@ -85,7 +85,7 @@ namespace MonoDevelop.DotNetCore void AlertButtonClicked (object sender, AlertButtonEventArgs e) { if (e.Button == downloadButton) - DesktopService.ShowUrl (downloadUrl); + IdeServices.DesktopService.ShowUrl (downloadUrl); } public void Dispose () diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs index 31b84eba34..b70088877a 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs @@ -624,7 +624,7 @@ namespace MonoDevelop.DotNetCore if (Project.Loading) return; - if (IdeApp.ProjectOperations == null) + if (!IdeApp.IsInitialized) return; if (IdeApp.ProjectOperations.CurrentSelectedSolution != Project.ParentSolution) diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs index 874f1cebd1..072e98b9c6 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs @@ -1,4 +1,4 @@ -// +// // POEditorWidget.cs // // Author: @@ -665,7 +665,7 @@ namespace MonoDevelop.Gettext line = "?"; } string fullName = System.IO.Path.Combine (System.IO.Path.GetDirectoryName (this.poFileName), file); - this.foundInStore.AppendValues (file, line, fullName, DesktopService.GetIconForFile (fullName, IconSize.Menu)); + this.foundInStore.AppendValues (file, line, fullName, IdeServices.DesktopService.GetIconForFile (fullName, IconSize.Menu)); } } @@ -974,7 +974,7 @@ namespace MonoDevelop.Gettext void ClearTasks () { - TaskService.Errors.ClearByOwner (this); + IdeServices.TaskService.Errors.ClearByOwner (this); } static bool CompareTasks (List<TaskListEntry> list1, List<TaskListEntry> list2) @@ -1141,7 +1141,7 @@ namespace MonoDevelop.Gettext Runtime.RunInMainThread (() => { ClearTasks (); currentTasks = tasks; - TaskService.Errors.AddRange (tasks); + IdeServices.TaskService.Errors.AddRange (tasks); }); } } diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs index c1bb0ba47b..1883d23709 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs @@ -1,4 +1,4 @@ -// GettextTool.cs +// GettextTool.cs // // Author: // Lluis Sanchez Gual <lluis@novell.com> @@ -45,8 +45,6 @@ namespace MonoDevelop.Gettext public async Task<int> Run (string[] arguments) { - DesktopService.Initialize (); - Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Gettext Update Tool")); foreach (string s in arguments) ReadArgument (s); diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs index 4cfaf6d88c..b752819a68 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs @@ -1,4 +1,4 @@ -//
+//
// TranslationProject.cs
//
// Author:
@@ -255,7 +255,7 @@ namespace MonoDevelop.Gettext if (!File.Exists (file.FilePath))
continue;
if (file.Subtype == Subtype.Code) {
- string mimeType = DesktopService.GetMimeTypeForUri (file.FilePath);
+ string mimeType = IdeServices.DesktopService.GetMimeTypeForUri (file.FilePath);
foreach (IFileScanner fs in scanners) {
if (fs.CanScan (this, catalog, file.FilePath, mimeType))
fs.UpdateCatalog (this, catalog, monitor, file.FilePath);
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs index 4a998d7201..c5ab26c480 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs @@ -1,4 +1,4 @@ -// +// // CodeBinder.cs // // Author: @@ -273,7 +273,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder // var matches = new List<INamedTypeSymbol> (); // ParsedDocument unit = null; // var ctx = gproject.GetParserContext (); -// var doc = TypeSystemService.ParseFile (project, classFile); +// var doc = IdeApp.TypeSystemService.ParseFile (project, classFile); // if (doc != null) { // unit = doc; // foreach (var fcls in unit.TopLevelTypeDefinitions) { diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs index a5be678483..3bdfd4a8b1 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs @@ -1,4 +1,4 @@ -// +// // GuiBuilderProject.cs // // Author: @@ -340,10 +340,10 @@ namespace MonoDevelop.GtkCore.GuiBuilder void OnFileAdded (object sender, ProjectFileEventArgs e) { foreach (ProjectFileEventInfo args in e) { - var docId = TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name); + var docId = IdeApp.TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name); if (docId == null) continue; - var doc = TypeSystemService.GetCodeAnalysisDocument (docId); + var doc = IdeApp.TypeSystemService.GetCodeAnalysisDocument (docId); if (doc == null) continue; @@ -373,10 +373,10 @@ namespace MonoDevelop.GtkCore.GuiBuilder foreach (ProjectFileEventInfo args in e) { - var docId = TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name); + var docId = IdeApp.TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name); if (docId == null) continue; - var doc = TypeSystemService.GetCodeAnalysisDocument (docId); + var doc = IdeApp.TypeSystemService.GetCodeAnalysisDocument (docId); if (doc == null) continue; var semanticModel = doc.GetSemanticModelAsync ().Result; @@ -554,7 +554,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder { System.Threading.Tasks.Task<Compilation> task; do { - task = TypeSystemService.GetCompilationAsync (Project); + task = IdeApp.TypeSystemService.GetCompilationAsync (Project); task.Wait (500); } while (!task.IsCompleted); diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs index 628ae3560a..0b374f4a72 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs @@ -1,4 +1,4 @@ -// +// // GtkDesignInfo.cs // // Authors: @@ -216,7 +216,7 @@ namespace MonoDevelop.GtkCore return (bool)project.ExtendedProperties ["GtkRefactoringSupported"]; var testFileName = project.LanguageBinding.GetFileName ("test"); - bool hasSupport = CodeGenerator.HasGenerator (DesktopService.GetMimeTypeForUri (testFileName)); + bool hasSupport = CodeGenerator.HasGenerator (IdeServices.DesktopService.GetMimeTypeForUri (testFileName)); project.ExtendedProperties ["GtkRefactoringSupported"] = hasSupport; return hasSupport; } diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs index 6128a6a9bf..c20b13cd50 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs @@ -1,4 +1,4 @@ -// +// // ProjectResourceProvider.cs // // Author: @@ -48,7 +48,7 @@ namespace MonoDevelop.GtkCore ArrayList list = new ArrayList (); foreach (ProjectFile file in project.Files) { if (file.BuildAction == BuildAction.EmbeddedResource) - list.Add (new Stetic.ResourceInfo (file.ResourceId, file.Name, DesktopService.GetMimeTypeForUri (file.Name))); + list.Add (new Stetic.ResourceInfo (file.ResourceId, file.Name, IdeServices.DesktopService.GetMimeTypeForUri (file.Name))); } return (Stetic.ResourceInfo[]) list.ToArray (typeof(Stetic.ResourceInfo)); } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs index 7b04a0876f..852aa83080 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs @@ -1,4 +1,4 @@ -//
+//
// LicenseAcceptanceDialog.cs
//
// Author:
@@ -134,7 +134,7 @@ namespace MonoDevelop.PackageManagement });
var licenseLabel = new LinkLabel (GettextCatalog.GetString ("View License"));
licenseLabel.Uri = package.LicenseUrl;
- licenseLabel.LinkClicked += (sender, e) => DesktopService.ShowUrl (e.Target.AbsoluteUri);
+ licenseLabel.LinkClicked += (sender, e) => IdeServices.DesktopService.ShowUrl (e.Target.AbsoluteUri);
titleBox.PackStart (licenseLabel);
var rowBox = new HBox ();
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopSolutionManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopSolutionManager.cs index 48e067851e..fee7c4fe3c 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopSolutionManager.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopSolutionManager.cs @@ -172,7 +172,7 @@ namespace MonoDevelop.PackageManagement void UpdateConfiguration () { - Configuration = IdeApp.Workspace?.ActiveConfiguration ?? ConfigurationSelector.Default; + Configuration = IdeApp.IsInitialized ? IdeApp.Workspace?.ActiveConfiguration ?? ConfigurationSelector.Default : ConfigurationSelector.Default; } public void EnsureSolutionIsLoaded () diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Gui/GtkReferenceAssembliesOptionsPanelWidget.UI.cs b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Gui/GtkReferenceAssembliesOptionsPanelWidget.UI.cs index 709e960c98..754586f6ef 100644 --- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Gui/GtkReferenceAssembliesOptionsPanelWidget.UI.cs +++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Gui/GtkReferenceAssembliesOptionsPanelWidget.UI.cs @@ -59,7 +59,7 @@ namespace MonoDevelop.Packaging.Gui learnMoreLabel.Xalign = 0F; learnMoreLabel.LabelProp = GettextCatalog.GetString ("<a href=\"https://docs.nuget.org\">Learn more</a>"); learnMoreLabel.UseMarkup = true; - learnMoreLabel.SetLinkHandler (DesktopService.ShowUrl); + learnMoreLabel.SetLinkHandler (IdeServices.DesktopService.ShowUrl); referenceAssembliesLabelHBox.PackStart (learnMoreLabel, false, false, 0); vbox.PackStart (referenceAssembliesLabelHBox, false, false, 5); diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs index 8603f62884..2e3cf9ac71 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs @@ -55,7 +55,7 @@ namespace MonoDevelop.AnalysisCore return; Dictionary<CodeDiagnosticDescriptor, DiagnosticSeverity?> severities = new Dictionary<CodeDiagnosticDescriptor, DiagnosticSeverity?> (); - var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync (); + var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.Instance.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync (); var language = CodeRefactoringService.MimeTypeToLanguage (lang); foreach (var node in options.AllDiagnostics.Where (x => x.Languages.Contains (language))) { severities [node] = node.DiagnosticSeverity; diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs index c138428331..e72923f9c3 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs @@ -1,4 +1,4 @@ - + // // ResultTooltipProvider.cs // @@ -45,6 +45,7 @@ using Microsoft.CodeAnalysis.CodeFixes; using System.Reflection; using MonoDevelop.CodeActions; using System.Windows.Input; +using MonoDevelop.Ide; namespace MonoDevelop.AnalysisCore.Gui { @@ -73,7 +74,7 @@ namespace MonoDevelop.AnalysisCore.Gui return null; var sb = StringBuilderCache.Allocate (); sb.Append ("<span font='"); - sb.Append (FontService.SansFontName); + sb.Append (IdeServices.FontService.SansFontName); sb.Append ("' size='small'>"); int minOffset = int.MaxValue; int maxOffset = -1; @@ -122,10 +123,10 @@ namespace MonoDevelop.AnalysisCore.Gui if (root.Span.End < offset) { LoggingService.LogError ($"Error in ResultTooltipProvider.GetItem offset {offset} not inside syntax root {root.Span.End} document length {editor.Length}."); } else { - var codeFixService = Ide.Composition.CompositionManager.GetExportedValue<ICodeFixService> (); + var codeFixService = Ide.Composition.CompositionManager.Instance.GetExportedValue<ICodeFixService> (); var span = new TextSpan (offset, 0); var fixes = await codeFixService.GetFixesAsync (ad, span, true, token); - var codeRefactoringService = Ide.Composition.CompositionManager.GetExportedValue<Microsoft.CodeAnalysis.CodeRefactorings.ICodeRefactoringService> (); + var codeRefactoringService = Ide.Composition.CompositionManager.Instance.GetExportedValue<Microsoft.CodeAnalysis.CodeRefactorings.ICodeRefactoringService> (); var refactorings = await codeRefactoringService.GetRefactoringsAsync (ad, span, token); tag = new CodeActions.CodeActionContainer (fixes, refactorings) { Span = new TextSpan (minOffset, Math.Max (0, maxOffset - minOffset)), diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs index 028bc37fcd..1a8be1f307 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs @@ -69,7 +69,7 @@ namespace MonoDevelop.AnalysisCore.Gui public class ResultsEditorExtension : TextEditorExtension, IQuickTaskProvider { bool disposed; - IDiagnosticService diagService = Ide.Composition.CompositionManager.GetExportedValue<IDiagnosticService> (); + IDiagnosticService diagService = Ide.Composition.CompositionManager.Instance.GetExportedValue<IDiagnosticService> (); protected override void Initialize () { diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs index 0e97bc01e7..6fb4d6c177 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs @@ -122,8 +122,8 @@ namespace MonoDevelop.CodeActions } } - ICodeFixService codeFixService = Ide.Composition.CompositionManager.GetExportedValue<ICodeFixService> (); - ICodeRefactoringService codeRefactoringService = Ide.Composition.CompositionManager.GetExportedValue<ICodeRefactoringService> (); + ICodeFixService codeFixService = Ide.Composition.CompositionManager.Instance.GetExportedValue<ICodeFixService> (); + ICodeRefactoringService codeRefactoringService = Ide.Composition.CompositionManager.Instance.GetExportedValue<ICodeRefactoringService> (); internal Task<CodeActionContainer> GetCurrentFixesAsync (CancellationToken cancellationToken) { var loc = Editor.CaretOffset; diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs index 3cd7acd1b2..571ad8e205 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs @@ -65,7 +65,7 @@ namespace MonoDevelop.CodeActions void GetAllProviderStates () { var language = CodeRefactoringService.MimeTypeToLanguage (mimeType); - var options = ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ().Result; + var options = ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.Instance.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ().Result; foreach (var node in options.AllRefactorings.Where (x => x.Language.Contains (language))) { providerStates [node] = node.IsEnabled; } diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs index 463f0d680d..f309fa2a76 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs @@ -63,7 +63,7 @@ namespace MonoDevelop.CodeActions return menu;
} - var options = ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ().Result; + var options = ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.Instance.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ().Result; int mnemonic = 1; var suppressLabel = GettextCatalog.GetString ("_Suppress"); @@ -284,8 +284,8 @@ namespace MonoDevelop.CodeActions var insertion = await insertionAction.CreateInsertion (token).ConfigureAwait (false); var document = await IdeApp.Workbench.OpenDocument (insertion.Location.SourceTree.FilePath, documentContext.Project); - var parsedDocument = await document.UpdateParseDocument (); - var model = await document.AnalysisDocument.GetSemanticModelAsync (token); + var parsedDocument = await document.DocumentContext.UpdateParseDocument (); + var model = await document.DocumentContext.AnalysisDocument.GetSemanticModelAsync (token); if (parsedDocument != null) { var insertionPoints = InsertionPointService.GetInsertionPoints ( document.Editor, @@ -300,8 +300,8 @@ namespace MonoDevelop.CodeActions point => { if (!point.Success) return; - var node = Formatter.Format (insertion.Node, document.RoslynWorkspace, document.GetOptionSet (), token); - point.InsertionPoint.Insert (document.Editor, document, node.ToString ()); + var node = Formatter.Format (insertion.Node, document.DocumentContext.RoslynWorkspace, document.DocumentContext.GetOptionSet (), token); + point.InsertionPoint.Insert (document.Editor, document.DocumentContext, node.ToString ()); // document = await Simplifier.ReduceAsync(document.AnalysisDocument, Simplifier.Annotation, cancellationToken: token).ConfigureAwait(false); } ); diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs index 3f1424f14f..0eab63ff83 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs @@ -77,7 +77,7 @@ namespace MonoDevelop.CodeIssues if (skip) continue; - var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync (); + var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.Instance.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync (); if (options.TryGetDiagnosticDescriptor (data.Id, out var desc) && !data.IsEnabledByDefault) continue; diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeRulePanel.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeRulePanel.cs index af0fd562ad..ae23d4bfec 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeRulePanel.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeRulePanel.cs @@ -1,4 +1,4 @@ -// +// // CodeRulePanel.cs // // Author: @@ -65,9 +65,9 @@ namespace MonoDevelop.CodeIssues TextEditor.MimeType = "application/xml"; TextEditor.Options = DefaultSourceEditorOptions.PlainEditor; try { - TextEditor.Text = TextFileUtility.GetText (TypeSystemService.RuleSetManager.GlobalRulesetFileName, out encoding); + TextEditor.Text = TextFileUtility.GetText (IdeApp.TypeSystemService.RuleSetManager.GlobalRulesetFileName, out encoding); } catch (Exception e) { - LoggingService.LogError ("Error while loading global rule set file " + TypeSystemService.RuleSetManager, e); + LoggingService.LogError ("Error while loading global rule set file " + IdeApp.TypeSystemService.RuleSetManager, e); loadingError = true; } } @@ -77,10 +77,10 @@ namespace MonoDevelop.CodeIssues if (loadingError) return; try { - TextFileUtility.WriteText (TypeSystemService.RuleSetManager.GlobalRulesetFileName, TextEditor.Text, encoding); + TextFileUtility.WriteText (IdeApp.TypeSystemService.RuleSetManager.GlobalRulesetFileName, TextEditor.Text, encoding); } catch (Exception e) { - LoggingService.LogError ("Error while saving global rule set file " + TypeSystemService.RuleSetManager.GlobalRulesetFileName, e); - MessageService.ShowError (GettextCatalog.GetString ("Error while saving global rule set file '{0}'.", TypeSystemService.RuleSetManager.GlobalRulesetFileName)); + LoggingService.LogError ("Error while saving global rule set file " + IdeApp.TypeSystemService.RuleSetManager.GlobalRulesetFileName, e); + MessageService.ShowError (GettextCatalog.GetString ("Error while saving global rule set file '{0}'.", IdeApp.TypeSystemService.RuleSetManager.GlobalRulesetFileName)); } } } diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs index c4c6491f05..f5851befbd 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs @@ -1,4 +1,4 @@ -// +// // BatchFixer.cs // // Author: @@ -102,13 +102,13 @@ namespace MonoDevelop.CodeIssues { var issues = new List<CodeIssue> (); // -// var document = TypeSystemService.ParseFile (file.Project, data); +// var document = IdeApp.TypeSystemService.ParseFile (file.Project, data); // if (document == null) { refactoringContext = null; // return issues; // } // -// var content = TypeSystemService.GetProjectContext (file.Project); +// var content = IdeApp.TypeSystemService.GetProjectContext (file.Project); // var compilation = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation (); // var resolver = new CSharpAstResolver (compilation, document.GetAst<SyntaxTree> (), document.ParsedFile as ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpUnresolvedFile); // diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs index 8306a6ab3c..501d59c101 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs @@ -1,4 +1,4 @@ -// +// // CodeIssueBatchRunner.cs // // Author: @@ -115,11 +115,11 @@ namespace MonoDevelop.CodeIssues // // Swallow exception and ignore this file // return; // } -// var document = TypeSystemService.ParseFile (file.Project, editor); +// var document = IdeApp.TypeSystemService.ParseFile (file.Project, editor); // if (document == null) // return; // -// var content = TypeSystemService.GetProjectContext (file.Project); +// var content = IdeApp.TypeSystemService.GetProjectContext (file.Project); // var compilation = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation (); // // CSharpAstResolver resolver; diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs index 15878be01b..156933f3f1 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs @@ -1,4 +1,4 @@ -// +// // AbstractAnalysisJob.cs // // Author: @@ -81,7 +81,7 @@ namespace MonoDevelop.CodeIssues public IEnumerable<BaseCodeIssueProvider> GetIssueProviders (ProjectFile file) { - return RefactoringService.GetInspectors (DesktopService.GetMimeTypeForUri (file.Name)) + return RefactoringService.GetInspectors (IdeServices.DesktopService.GetMimeTypeForUri (file.Name)) .Where (provider => { var severity = provider.GetSeverity (); if (severity == Severity.None || !provider.GetIsEnabled ()) diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/AbstractOptionPreviewViewModel.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/AbstractOptionPreviewViewModel.cs index 1b9af87145..43817ec03d 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/AbstractOptionPreviewViewModel.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/AbstractOptionPreviewViewModel.cs @@ -30,30 +30,20 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading; +using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeStyle; -using Microsoft.CodeAnalysis.Editor; -using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Preview; using Microsoft.CodeAnalysis.Formatting; using Microsoft.CodeAnalysis.Host; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Text; using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities; -using Microsoft.VisualStudio.Text; -using Microsoft.VisualStudio.Text.Editor; -using Microsoft.VisualStudio.Text.Projection; -using Microsoft.VisualStudio.Utilities; -using Roslyn.Utilities; -using MonoDevelop.Ide.Editor; -using MonoDevelop.Ide.Composition; using MonoDevelop.Core.Text; +using MonoDevelop.Ide.Editor; using MonoDevelop.Ide.TypeSystem; -using MonoDevelop.Projects; -using System.Threading.Tasks; -using MonoDevelop.Core; +using Roslyn.Utilities; namespace MonoDevelop.Refactoring.Options { @@ -129,7 +119,7 @@ namespace MonoDevelop.Refactoring.Options public async void UpdatePreview (string text) { - var workspace = new PreviewWorkspace (MonoDevelop.Ide.Composition.CompositionManager.Instance.HostServices); + var workspace = new PreviewWorkspace (Ide.Composition.CompositionManager.Instance.HostServices); var fileName = string.Format ("project.{0}", Language == "C#" ? "csproj" : "vbproj"); project = workspace.CurrentSolution.AddProject (fileName, "assembly.dll", Language); diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/UI/GridOptionPreviewControl.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/UI/GridOptionPreviewControl.cs index 85e5f6e03a..b1c29c76d5 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/UI/GridOptionPreviewControl.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/UI/GridOptionPreviewControl.cs @@ -35,6 +35,7 @@ using System.Composition.Hosting; using MonoDevelop.Ide.Composition; using MonoDevelop.Core; using System.Collections.Generic; +using MonoDevelop.Ide; namespace MonoDevelop.Refactoring.Options { @@ -44,7 +45,7 @@ namespace MonoDevelop.Refactoring.Options public AbstractOptionPageControl (IServiceProvider serviceProvider) { - this.OptionService = TypeSystemService.Workspace.Services.GetService<IOptionService> (); + this.OptionService = IdeApp.TypeSystemService.Workspace.Services.GetService<IOptionService> (); } } @@ -65,7 +66,7 @@ namespace MonoDevelop.Refactoring.Options public GridOptionPreviewControl (IServiceProvider serviceProvider, Func<OptionSet, IServiceProvider, AbstractOptionPreviewViewModel> createViewModel) : base (serviceProvider) { - viewModel = createViewModel (TypeSystemService.Workspace.Options, serviceProvider); + viewModel = createViewModel (IdeApp.TypeSystemService.Workspace.Options, serviceProvider); CreateView (); var firstItem = this.viewModel.CodeStyleItems.OfType<AbstractCodeStyleOptionViewModel> ().First (); this.viewModel.SetOptionAndUpdatePreview ((firstItem.SelectedPreference ?? firstItem.Preferences[0]).IsChecked, firstItem.Option, firstItem.GetPreview ()); diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.PackageInstaller/PackageInstallerService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.PackageInstaller/PackageInstallerService.cs index 36aa9a7a60..ea499f5c42 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.PackageInstaller/PackageInstallerService.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.PackageInstaller/PackageInstallerService.cs @@ -114,7 +114,7 @@ namespace MonoDevelop.Refactoring.PackageInstaller public IEnumerable<Project> GetProjectsWithInstalledPackage (Solution solution, string packageName, string version) { - return PackageServices.GetProjectsWithInstalledPackage (IdeApp.ProjectOperations.CurrentSelectedSolution, packageName, version).Select (p => TypeSystemService.GetCodeAnalysisProject (p)); + return PackageServices.GetProjectsWithInstalledPackage (IdeApp.ProjectOperations.CurrentSelectedSolution, packageName, version).Select (p => IdeApp.TypeSystemService.GetCodeAnalysisProject (p)); } public bool IsInstalled (Workspace workspace, ProjectId projectId, string packageName) diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeCurrentProjectHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeCurrentProjectHandler.cs index 04d590cb79..06d58b6073 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeCurrentProjectHandler.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeCurrentProjectHandler.cs @@ -52,7 +52,7 @@ namespace MonoDevelop.Refactoring protected override void Update (CommandInfo info) { var project = IdeApp.ProjectOperations.CurrentSelectedProject; - if (project == null || TypeSystemService.GetCodeAnalysisProject (project) == null) { + if (project == null || IdeApp.TypeSystemService.GetCodeAnalysisProject (project) == null) { info.Text = GettextCatalog.GetString ("Current Project"); info.Enabled = false; return; @@ -71,7 +71,7 @@ namespace MonoDevelop.Refactoring var project = IdeApp.ProjectOperations.CurrentSelectedProject; if (project == null) return; - var analysisProject = TypeSystemService.GetCodeAnalysisProject (project); + var analysisProject = IdeApp.TypeSystemService.GetCodeAnalysisProject (project); if (analysisProject == null) return; try { diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs index 5a09a86840..797c3da6bd 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs @@ -52,7 +52,7 @@ namespace MonoDevelop.Refactoring {
var providers = new List<DiagnosticAnalyzer> (); var alreadyAdded = new HashSet<Type> (); - var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync (); + var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.Instance.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync (); var diagnostics = options.AllDiagnostics.Where (x => x.Languages.Contains (LanguageNames.CSharp)); var diagnosticTable = new Dictionary<string, CodeDiagnosticDescriptor> (); foreach (var diagnostic in diagnostics) { @@ -115,7 +115,7 @@ namespace MonoDevelop.Refactoring internal static async void Execute () {
- var workspace = TypeSystemService.Workspace; + var workspace = IdeApp.TypeSystemService.Workspace; try { using (var monitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (GettextCatalog.GetString ("Analyzing solution"), null, false, true, false, null, true)) { CancellationToken token = monitor.CancellationToken; @@ -147,8 +147,8 @@ namespace MonoDevelop.Refactoring internal static void Report (ProgressMonitor monitor, List<Diagnostic> allDiagnostics, Projects.WorkspaceObject parent) { monitor.BeginTask (GettextCatalog.GetString ("Reporting results..."), allDiagnostics.Count); - TaskService.Errors.Clear (); - TaskService.Errors.AddRange (allDiagnostics.Select (diagnostic => { + IdeServices.TaskService.Errors.Clear (); + IdeServices.TaskService.Errors.AddRange (allDiagnostics.Select (diagnostic => { var startLinePosition = diagnostic.Location.GetLineSpan ().StartLinePosition; return new TaskListEntry ( diagnostic.Location.SourceTree.FilePath, @@ -172,7 +172,7 @@ namespace MonoDevelop.Refactoring static void ShowAnalyzationResults () {
- TaskService.ShowErrors (); + IdeServices.TaskService.ShowErrors (); var errorsPad = IdeApp.Workbench.GetPad<ErrorListPad> ().Content as ErrorListPad; errorsPad.SetFilter (true, true, true); } @@ -207,7 +207,7 @@ namespace MonoDevelop.Refactoring public override Projects.Project Project { get { - return TypeSystemService.GetMonoProject (project); + return IdeApp.TypeSystemService.GetMonoProject (project); } } diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs index ae8a9e92bb..d8dad6141f 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs @@ -1,4 +1,4 @@ -// +// // RefactoringOptions.cs // // Author: @@ -66,7 +66,7 @@ namespace MonoDevelop.Refactoring public string MimeType { get { - return DesktopService.GetMimeTypeForUri (DocumentContext.Name); + return IdeServices.DesktopService.GetMimeTypeForUri (DocumentContext.Name); } } @@ -81,7 +81,7 @@ namespace MonoDevelop.Refactoring { } - public RefactoringOptions (MonoDevelop.Ide.Gui.Document doc) : this(doc.Editor, doc) + public RefactoringOptions (MonoDevelop.Ide.Gui.Document doc) : this(doc.Editor, doc.DocumentContext) { } @@ -172,7 +172,7 @@ namespace MonoDevelop.Refactoring // public List<string> GetResolveableNamespaces (RefactoringOptions options, out bool resolveDirect) // { // IReturnType returnType = null; -// INRefactoryASTProvider astProvider = RefactoringService.GetASTProvider (DesktopService.GetMimeTypeForUri (options.Document.FileName)); +// INRefactoryASTProvider astProvider = RefactoringService.GetASTProvider (IdeServices.DesktopService.GetMimeTypeForUri (options.Document.FileName)); // // if (options.ResolveResult != null && options.ResolveResult.ResolvedExpression != null) { // if (astProvider != null) diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs index bfb8a69ea8..386fd9c1f8 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs @@ -1,4 +1,4 @@ -// +// // RefactoringPreviewDialog.cs // // Author: @@ -168,7 +168,7 @@ namespace MonoDevelop.Refactoring TreeIter result; if (!fileDictionary.TryGetValue (replaceChange.FileName, out result)) - fileDictionary[replaceChange.FileName] = result = store.AppendValues (DesktopService.GetIconForFile (replaceChange.FileName, IconSize.Menu), System.IO.Path.GetFileName (replaceChange.FileName), null, true); + fileDictionary[replaceChange.FileName] = result = store.AppendValues (IdeServices.DesktopService.GetIconForFile (replaceChange.FileName, IconSize.Menu), System.IO.Path.GetFileName (replaceChange.FileName), null, true); return result; } @@ -260,7 +260,7 @@ namespace MonoDevelop.Refactoring layout = new Pango.Layout (container.PangoContext); layout.SingleParagraphMode = false; if (diffMode) { - layout.FontDescription = FontService.MonospaceFont; + layout.FontDescription = IdeServices.FontService.MonospaceFont; layout.SetText (text); } else { layout.SetMarkup (text); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextEditorKeyPressTimings.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextEditorKeyPressTimings.cs index fddc0a37c6..6a7f9f7884 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextEditorKeyPressTimings.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextEditorKeyPressTimings.cs @@ -76,7 +76,7 @@ namespace Mono.TextEditor public TextEditorKeyPressTimings (TextDocument document) { - telemetry = DesktopService.PlatformTelemetry; + telemetry = IdeServices.DesktopService?.PlatformTelemetry; openTime = GetCurrentTime (); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs index ca12d8fa90..1ce5a0c5ac 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs @@ -68,7 +68,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels style = style.CloneWithName (entryName.Text); - string path = MonoDevelop.Ide.Editor.TextEditorDisplayBinding.SyntaxModePath; + string path = SyntaxHighlightingService.SyntaxModePath; string baseName = style.Name.Replace (" ", "_"); while (File.Exists (System.IO.Path.Combine (path, baseName + ".tmTheme"))) { diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ClipboardRingService.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ClipboardRingService.cs index 8b7b82c1c5..e5cbe4f179 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ClipboardRingService.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ClipboardRingService.cs @@ -106,7 +106,7 @@ namespace MonoDevelop.SourceEditor { static readonly ToolboxItemFilterAttribute filterAtt = new ToolboxItemFilterAttribute ("text/plain", ToolboxItemFilterType.Allow); static readonly string category = GettextCatalog.GetString ("Clipboard Ring"); - static readonly Xwt.Drawing.Image icon = DesktopService.GetIconForFile ("a.txt", IconSize.Menu); + static readonly Xwt.Drawing.Image icon = IdeServices.DesktopService.GetIconForFile ("a.txt", IconSize.Menu); public ClipboardToolboxNode (string text) { diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs index 3a992d8567..ab8eced2a9 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs @@ -1,4 +1,4 @@ -// DebugValueWindow.cs +// DebugValueWindow.cs // // Author: // Lluis Sanchez Gual <lluis@novell.com> @@ -195,7 +195,7 @@ namespace MonoDevelop.SourceEditor this.GetPosition (out x, out y); oldY = y; - Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (x, y)); + Xwt.Rectangle geometry = IdeServices.DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (x, y)); int top = (int)geometry.Top; if (allocation.Height <= geometry.Height && y + allocation.Height >= geometry.Y + geometry.Height - edgeGap) y = top + ((int)geometry.Height - allocation.Height - edgeGap); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs index fd324c9191..f03a911949 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs @@ -1,4 +1,4 @@ -// LanguageItemWindow.cs +// LanguageItemWindow.cs // // Author: // Mike Krüger <mkrueger@novell.com> @@ -34,6 +34,7 @@ using MonoDevelop.Ide.Gui; using MonoDevelop.Core; using MonoDevelop.Ide.Fonts; using MonoDevelop.Ide.TypeSystem; +using MonoDevelop.Ide; namespace MonoDevelop.SourceEditor { @@ -84,7 +85,7 @@ namespace MonoDevelop.SourceEditor { if (label == null) return; - label.FontDescription = FontService.GetFontDescription ("Pad"); + label.FontDescription = IdeServices.FontService.GetFontDescription ("Pad"); } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs index 38959fc431..e05c1ff759 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs @@ -1,4 +1,4 @@ -// +// // MessageBubbleCache.cs // // Author: @@ -60,9 +60,9 @@ namespace MonoDevelop.SourceEditor editor.TextArea.BeginHover += HandleBeginHover; editor.VAdjustment.ValueChanged += HandleValueChanged; editor.HAdjustment.ValueChanged += HandleValueChanged; - fontDescription = FontService.GetFontDescription ("Pad"); - tooltipFontDescription = FontService.GetFontDescription ("Pad").CopyModified (weight: Pango.Weight.Bold); - errorCountFontDescription = FontService.GetFontDescription ("Pad").CopyModified (weight: Pango.Weight.Bold); + fontDescription = IdeServices.FontService.GetFontDescription ("Pad"); + tooltipFontDescription = IdeServices.FontService.GetFontDescription ("Pad").CopyModified (weight: Pango.Weight.Bold); + errorCountFontDescription = IdeServices.FontService.GetFontDescription ("Pad").CopyModified (weight: Pango.Weight.Bold); } void HandleValueChanged (object sender, EventArgs e) diff --git a/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/Language/Impl/Intellisense/SignatureHelp/DefaultSignatureHelpPresenterSurfaceElement.cs b/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/Language/Impl/Intellisense/SignatureHelp/DefaultSignatureHelpPresenterSurfaceElement.cs index 78018663ce..31dd15adcf 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/Language/Impl/Intellisense/SignatureHelp/DefaultSignatureHelpPresenterSurfaceElement.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/Language/Impl/Intellisense/SignatureHelp/DefaultSignatureHelpPresenterSurfaceElement.cs @@ -1,4 +1,4 @@ -using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -86,14 +86,14 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation if (!scheme.FitsIdeTheme(IdeApp.Preferences.UserInterfaceTheme))
scheme = SyntaxHighlightingService.GetDefaultColorStyle(IdeApp.Preferences.UserInterfaceTheme);
Theme.SetSchemeColors(scheme);
- Theme.Font = FontService.SansFont.CopyModified(Styles.FontScale11).ToXwtFont();
+ Theme.Font = IdeServices.FontService.SansFont.CopyModified(Styles.FontScale11).ToXwtFont();
Theme.ShadowColor = Styles.PopoverWindow.ShadowColor;
foreColor = Styles.PopoverWindow.DefaultTextColor.ToCairoColor();
if (DataContext != null)
{
DataContext.SignatureWpfViewVisualElement.ModifyFg(StateType.Normal, foreColor.ToGdkColor());
- DataContext.SignatureWpfViewVisualElement.FontDescription = FontService.GetFontDescription("Editor").CopyModified(Styles.FontScale11);
+ DataContext.SignatureWpfViewVisualElement.FontDescription = IdeServices.FontService.GetFontDescription("Editor").CopyModified(Styles.FontScale11);
}
//if (this.Visible)
// QueueDraw ();
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/MDUtils.cs b/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/MDUtils.cs index 1db38d9500..5a70528b2d 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/MDUtils.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/MDUtils.cs @@ -1,4 +1,4 @@ -using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -6,6 +6,7 @@ using System.Threading.Tasks; using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Classification;
using MonoDevelop.Core;
+using MonoDevelop.Ide;
using MonoDevelop.Ide.Editor;
using MonoDevelop.Ide.Editor.Highlighting;
using MonoDevelop.Ide.Fonts; @@ -28,7 +29,7 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation if (!inDocumentation) {
if (part.ClassificationType.Classification == ClassificationTypeNames.Text) { inDocumentation = true;
- markup.Append ("<span font='" + FontService.SansFontName + "' size='small'>");
+ markup.Append ("<span font='" + IdeServices.FontService.SansFontName + "' size='small'>");
markup.AppendLine ();
} else { @@ -83,7 +84,7 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation if (currentParameter != null) {
if (!string.IsNullOrEmpty(currentParameter.Documentation)) {
- markup.Append ("<span font='" + FontService.SansFontName + "'");
+ markup.Append ("<span font='" + IdeServices.FontService.SansFontName + "'");
//markup.Append ("foreground ='" + GetThemeColor (theme, "source.cs") + "'");
markup.Append (" size='small'>");
markup.AppendLine ();
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs index a59bbcbf71..48b4efc32f 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs @@ -141,7 +141,7 @@ namespace MonoDevelop.UnitTesting book.Pack1 (sw, true, true); outputView = new MonoDevelop.Ide.Gui.Components.LogView.LogTextView { Name = "testResultOutput" }; - outputView.ModifyFont (FontService.MonospaceFont); + outputView.ModifyFont (IdeServices.FontService.MonospaceFont); outputView.Editable = false; bold = new TextTag ("bold"); bold.Weight = Pango.Weight.Bold; @@ -745,7 +745,7 @@ namespace MonoDevelop.UnitTesting const int maxLineLength = 255; const int maxLineNumber = 255; sb.Append ("<span font='"); - sb.Append (FontService.MonospaceFontName); + sb.Append (IdeServices.FontService.MonospaceFontName); sb.Append ("'>"); using (var sr = new StringReader (result.Message)) { while (null != (curLineText = sr.ReadLine ())) { diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs index 24a5e9dcc9..fe4b4fc3eb 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs @@ -33,6 +33,7 @@ using MonoDevelop.UnitTesting; using MonoDevelop.Ide.TypeSystem; using Microsoft.CodeAnalysis; using System.Linq; +using MonoDevelop.Ide; namespace MonoDevelop.UnitTesting.VsTest { @@ -64,7 +65,7 @@ namespace MonoDevelop.UnitTesting.VsTest if (!string.IsNullOrEmpty (test.CodeFilePath)) sourceCodeLocation = new SourceCodeLocation (test.CodeFilePath, test.LineNumber, 0); else { - TypeSystemService.GetCompilationAsync (Project).ContinueWith ((t) => { + IdeApp.TypeSystemService.GetCompilationAsync (Project).ContinueWith ((t) => { var dotIndex = test.FullyQualifiedName.LastIndexOf (".", StringComparison.Ordinal); var className = test.FullyQualifiedName.Remove (dotIndex); var methodName = test.FullyQualifiedName.Substring (dotIndex + 1); diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs index 9f89cee925..04c3715e09 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs @@ -1,4 +1,4 @@ -// +// // NUnitService.cs // // Author: @@ -423,9 +423,9 @@ namespace MonoDevelop.UnitTesting public static string GetTestResultsDirectory (string baseDirectory) { - var newCache = TypeSystemService.GetCacheDirectory (baseDirectory, false); + var newCache = IdeApp.TypeSystemService.GetCacheDirectory (baseDirectory, false); if (newCache == null) { - newCache = TypeSystemService.GetCacheDirectory (baseDirectory, true); + newCache = IdeApp.TypeSystemService.GetCacheDirectory (baseDirectory, true); var oldDirectory = Path.Combine (baseDirectory, "test-results"); var newDirectory = Path.Combine (newCache, "test-results"); try { diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs index 78a26818aa..03f2252b04 100644 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs +++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs @@ -1,4 +1,4 @@ -// +// // TextTemplatingService.cs // // Author: @@ -25,6 +25,7 @@ // THE SOFTWARE. using Mono.TextTemplating; +using MonoDevelop.Ide; using MonoDevelop.Ide.Tasks; using System.CodeDom.Compiler; @@ -37,12 +38,12 @@ namespace MonoDevelop.TextTemplating if (errors.Count == 0) return; - TaskService.Errors.Clear (); + IdeServices.TaskService.Errors.Clear (); foreach (CompilerError err in errors) { - TaskService.Errors.Add (new TaskListEntry (err.FileName, err.ErrorText, err.Column, err.Line, + IdeServices.TaskService.Errors.Add (new TaskListEntry (err.FileName, err.ErrorText, err.Column, err.Line, err.IsWarning? TaskSeverity.Warning : TaskSeverity.Error)); } - TaskService.ShowErrors (); + IdeServices.TaskService.ShowErrors (); } static TemplatingAppDomainRecycler recycler; diff --git a/main/src/addins/VBNetBinding/MonoDevelop.VBNet/VBNetTextEditorExtension.cs b/main/src/addins/VBNetBinding/MonoDevelop.VBNet/VBNetTextEditorExtension.cs index e57e007b14..88172e0d62 100644 --- a/main/src/addins/VBNetBinding/MonoDevelop.VBNet/VBNetTextEditorExtension.cs +++ b/main/src/addins/VBNetBinding/MonoDevelop.VBNet/VBNetTextEditorExtension.cs @@ -35,7 +35,7 @@ namespace MonoDevelop.VBNet { protected override void Initialize () { - Editor.SyntaxHighlighting = CompositionManager.GetExportedValue<ITagBasedSyntaxHighlightingFactory> ().CreateSyntaxHighlighting (Editor.TextView, "source.vb"); + Editor.SyntaxHighlighting = CompositionManager.Instance.GetExportedValue<ITagBasedSyntaxHighlightingFactory> ().CreateSyntaxHighlighting (Editor.TextView, "source.vb"); } } } diff --git a/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs b/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs index 8ba7c6c62e..2ba3d37928 100644 --- a/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs +++ b/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs @@ -1,4 +1,4 @@ -// VBCompilerParameters.cs +// VBCompilerParameters.cs // // This file was derived from a file from #Develop, and relicensed // by Markus Palme to MIT/X11 @@ -36,6 +36,7 @@ using MonoDevelop.Core.Serialization; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.VisualBasic; using System.Collections.Immutable; +using MonoDevelop.Ide; namespace MonoDevelop.VBNetBinding {
@@ -204,7 +205,7 @@ namespace MonoDevelop.VBNetBinding public override CompilationOptions CreateCompilationOptions () { var project = (VBProject)ParentProject; - var workspace = Ide.TypeSystem.TypeSystemService.GetWorkspace (project.ParentSolution); + var workspace = IdeApp.TypeSystemService.GetWorkspace (project.ParentSolution); var options = new VisualBasicCompilationOptions ( OutputKind.ConsoleApplication, diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs index ad5a18da85..76b1765619 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs @@ -1,4 +1,4 @@ - + using System; using System.Collections.Generic; using Gtk; @@ -93,7 +93,7 @@ namespace MonoDevelop.VersionControl.Views Pango.Layout layout = new Pango.Layout (container.PangoContext); layout.SingleParagraphMode = false; if (diffMode) { - layout.FontDescription = FontService.MonospaceFont; + layout.FontDescription = IdeServices.FontService.MonospaceFont; layout.SetText (text); } else { layout.SetMarkup (text); diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs index 0df03a9b53..ca0b3b7d06 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading; using Gtk; @@ -234,7 +234,7 @@ namespace MonoDevelop.VersionControl.Views if (n.IsDirectory) fileIcon = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.ClosedFolder, Gtk.IconSize.Menu); else - fileIcon = DesktopService.GetIconForFile (n.LocalPath, Gtk.IconSize.Menu); + fileIcon = IdeServices.DesktopService.GetIconForFile (n.LocalPath, Gtk.IconSize.Menu); TreeIter it = filestore.AppendValues (statusicon, lstatus, GLib.Markup.EscapeText (localpath).Split ('\n'), commit, false, n.LocalPath.ToString (), true, hasComment, fileIcon, n.HasLocalChanges, scolor); if (!n.IsDirectory) 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 6ccb133214..8b375cbdef 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 @@ -1,4 +1,4 @@ - + // // ComparisonWidget.cs // @@ -84,7 +84,7 @@ namespace MonoDevelop.VersionControl.Views public override void Dispose() { - FontService.RemoveCallback (UpdateFont); + IdeServices.FontService.RemoveCallback (UpdateFont); } void UpdateFont () diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs index 17cfb0693e..b98b5a3148 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs @@ -1,4 +1,4 @@ -// +// // DropDownBox.cs // // Author: @@ -110,7 +110,7 @@ namespace MonoDevelop.VersionControl.Views window.WidthRequest = Allocation.Width; int width, height; window.GetSizeRequest (out width, out height); - Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (dx, dy)); + Xwt.Rectangle geometry = IdeServices.DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (dx, dy)); if (dy + height > geometry.Bottom) dy = oy + this.Allocation.Y - height; diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs index a4eb5f96ea..bf9bc33725 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs @@ -1,4 +1,4 @@ -// +// // MergeWidget.cs // // Author: @@ -79,7 +79,7 @@ namespace MonoDevelop.VersionControl.Views public void Load (string fileName) { - MainEditor.Document.MimeType = DesktopService.GetMimeTypeForUri (fileName); + MainEditor.Document.MimeType = IdeServices.DesktopService.GetMimeTypeForUri (fileName); MainEditor.Document.Text = StringTextSource.ReadFrom (fileName).Text; this.CreateDiff (); diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs index 12f642acf8..8359d9a992 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs @@ -1,4 +1,4 @@ - + using System; using System.IO; using System.Text; @@ -899,7 +899,7 @@ namespace MonoDevelop.VersionControl public virtual bool GetFileIsText (FilePath path) { - return DesktopService.GetFileIsText (path); + return IdeServices.DesktopService.GetFileIsText (path); } } diff --git a/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs b/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs index 7f91ebc5f9..60b0675b39 100644 --- a/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs +++ b/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs @@ -1,4 +1,4 @@ -using System;
+using System;
using System.IO;
using System.Linq;
using System.Collections.Generic;
@@ -77,7 +77,7 @@ namespace SubversionAddinWindows AlertButton.Ok);
if (res == db) {
- DesktopService.ShowUrl ("https://www.microsoft.com/en-us/download/details.aspx?id=5555");
+ IdeServices.DesktopService.ShowUrl ("https://www.microsoft.com/en-us/download/details.aspx?id=5555");
}
}
return !installError;
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs index ad6b0d3a7f..9592d047fb 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs @@ -1,4 +1,4 @@ -//
+//
// OpenFileDialogHandler.cs
//
// Authors:
@@ -236,7 +236,7 @@ namespace MonoDevelop.Platform int selected = -1;
int i = 0;
bool hasBench = false;
- var projectService = IdeApp.Services.ProjectService;
+ var projectService = IdeServices.ProjectService;
if (projectService.IsWorkspaceItemFile (fileName) || projectService.IsSolutionItemFile (fileName)) {
hasBench = true;
combo.Items.Add (new ViewerComboItem (null, GettextCatalog.GetString ("Solution Workbench")));
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs index 4c907433e8..2d843b156a 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs @@ -1,4 +1,4 @@ -//
+//
// JumpList.cs
//
// Author:
@@ -40,7 +40,7 @@ namespace MonoDevelop.Platform this.updateTimer.Elapsed += this.OnUpdateTimerEllapsed;
this.updateTimer.AutoReset = false;
- this.recentFiles = DesktopService.RecentFiles;
+ this.recentFiles = IdeServices.DesktopService.RecentFiles;
this.recentFiles.Changed += this.OnRecentFilesChanged;
try {
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs index 5bd471ab7e..f395a42299 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs @@ -53,7 +53,7 @@ namespace WindowsPlatform.MainToolbar updateHandler = delegate {
int ec = 0, wc = 0;
- foreach (MonoDevelop.Ide.Tasks.TaskListEntry t in TaskService.Errors) {
+ foreach (MonoDevelop.Ide.Tasks.TaskListEntry t in IdeServices.TaskService.Errors) {
if (t.Severity == TaskSeverity.Error)
ec++;
else if (t.Severity == TaskSeverity.Warning)
@@ -73,8 +73,8 @@ namespace WindowsPlatform.MainToolbar BuildResultPanelVisibility = Visibility.Collapsed;
});
};
- TaskService.Errors.TasksAdded += updateHandler;
- TaskService.Errors.TasksRemoved += updateHandler;
+ IdeServices.TaskService.Errors.TasksAdded += updateHandler;
+ IdeServices.TaskService.Errors.TasksRemoved += updateHandler;
BrandingService.ApplicationNameChanged += ApplicationNameChanged;
StatusText.ToolTipOpening += (o, e) => {
@@ -119,8 +119,8 @@ namespace WindowsPlatform.MainToolbar public void Dispose ()
{
- TaskService.Errors.TasksAdded -= updateHandler;
- TaskService.Errors.TasksRemoved -= updateHandler;
+ IdeServices.TaskService.Errors.TasksAdded -= updateHandler;
+ IdeServices.TaskService.Errors.TasksRemoved -= updateHandler;
BrandingService.ApplicationNameChanged -= ApplicationNameChanged;
}
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs index bfcc1953c3..8ee0e5c2a6 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs @@ -242,7 +242,7 @@ namespace WindowsPlatform.MainToolbar void OnMenuLinkClicked (object sender, RoutedEventArgs e)
{
- DesktopService.ShowUrl (menuLinkEntry.Url);
+ IdeServices.DesktopService.ShowUrl (menuLinkEntry.Url);
}
void OnSubmenuClosing ()
diff --git a/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs b/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs index 8d79c1074c..ae36937b89 100644 --- a/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs +++ b/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs @@ -1,4 +1,4 @@ -// +// // XmlTextEditorExtension.cs // // Authors: @@ -95,7 +95,7 @@ namespace MonoDevelop.Xml.Editor XmlSchemaManager.UserSchemaAdded -= UserSchemaAdded; XmlSchemaManager.UserSchemaRemoved -= UserSchemaRemoved; - TaskService.Errors.ClearByOwner (this); + IdeServices.TaskService.Errors.ClearByOwner (this); base.Dispose (); } } @@ -547,7 +547,7 @@ namespace MonoDevelop.Xml.Editor if (string.IsNullOrEmpty (fileName)) return false; - string mimeType = DesktopService.GetMimeTypeForUri (fileName); + string mimeType = IdeServices.DesktopService.GetMimeTypeForUri (fileName); if (IsMimeTypeHandled (mimeType)) return true; @@ -556,7 +556,7 @@ namespace MonoDevelop.Xml.Editor static bool IsMimeTypeHandled (string mimeType) { - foreach (var m in DesktopService.GetMimeTypeInheritanceChain (mimeType)) { + foreach (var m in IdeServices.DesktopService.GetMimeTypeInheritanceChain (mimeType)) { if (m == TextXmlMimeType || m == ApplicationXmlMimeType) return true; } @@ -627,7 +627,7 @@ namespace MonoDevelop.Xml.Editor public void CreateSchemaCommand () { try { - TaskService.Errors.Clear (); + IdeServices.TaskService.Errors.Clear (); string xml = Editor.Text; using (ProgressMonitor monitor = XmlEditorService.GetMonitor ()) { @@ -703,7 +703,7 @@ namespace MonoDevelop.Xml.Editor [CommandHandler (XmlCommands.Validate)] public async void ValidateCommand () { - TaskService.Errors.Clear (); + IdeServices.TaskService.Errors.Clear (); using (var monitor = XmlEditorService.GetMonitor ()) { monitor.BeginTask (GettextCatalog.GetString ("Validating {0}...", FileName.FileName), 0); @@ -724,16 +724,16 @@ namespace MonoDevelop.Xml.Editor void UpdateErrors (List<Projects.BuildError> errors) { - TaskService.Errors.ClearByOwner (this); + IdeServices.TaskService.Errors.ClearByOwner (this); if (errors.Count == 0) return; foreach (var error in errors) { - TaskService.Errors.Add (new TaskListEntry (error) { + IdeServices.TaskService.Errors.Add (new TaskListEntry (error) { WorkspaceObject = DocumentContext.Project, Owner = this }); } - TaskService.ShowErrors (); + IdeServices.TaskService.ShowErrors (); } [CommandHandler (XmlCommands.AssignStylesheet)] diff --git a/main/src/addins/Xml/Formatting/XmlFormatter.cs b/main/src/addins/Xml/Formatting/XmlFormatter.cs index 05eab308ce..b8b4f5b1ca 100644 --- a/main/src/addins/Xml/Formatting/XmlFormatter.cs +++ b/main/src/addins/Xml/Formatting/XmlFormatter.cs @@ -1,4 +1,4 @@ -// +// // XmlFormatter.cs // // Author: @@ -71,7 +71,7 @@ namespace MonoDevelop.Xml.Formatting { if (policyParent == null) policyParent = PolicyService.DefaultPolicies; - var mimeTypeInheritanceChain = DesktopService.GetMimeTypeInheritanceChain (mimeType).ToList (); + var mimeTypeInheritanceChain = IdeServices.DesktopService.GetMimeTypeInheritanceChain (mimeType).ToList (); var txtPol = policyParent.Get<TextStylePolicy> (mimeTypeInheritanceChain); var xmlPol = policyParent.Get<XmlFormattingPolicy> (mimeTypeInheritanceChain); return new StringTextSource(FormatXml (txtPol, xmlPol, input.Text)); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs index 0796418f98..b7fad4b533 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestSession.cs @@ -1,4 +1,4 @@ -// +// // AutoTestServer.cs // // Author: @@ -242,12 +242,12 @@ namespace MonoDevelop.Components.AutoTest // FIXME: This shouldn't be here. public int ErrorCount (TaskSeverity severity) { - return TaskService.Errors.Count (x => x.Severity == severity); + return IdeServices.TaskService.Errors.Count (x => x.Severity == severity); } public List<TaskListEntryDTO> GetErrors (TaskSeverity severity) { - return TaskService.Errors.Where (x => x.Severity == severity).Select (x => new TaskListEntryDTO () { + return IdeServices.TaskService.Errors.Where (x => x.Severity == severity).Select (x => new TaskListEntryDTO () { Line = x.Line, Description = x.Description, File = x.FileName.FileName, diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs index 8fbd898711..7f7743b443 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs @@ -1,4 +1,4 @@ -// +// // TabStrip.cs // // Author: @@ -1222,7 +1222,7 @@ namespace MonoDevelop.Components.DockNotebook Pango.Layout CreateSizedLayout (bool active) { var la = new Pango.Layout (PangoContext); - la.FontDescription = Ide.Fonts.FontService.SansFont.Copy (); + la.FontDescription = IdeServices.FontService.SansFont.Copy (); if (!Core.Platform.IsWindows) la.FontDescription.Weight = Pango.Weight.Bold; la.FontDescription.AbsoluteSize = Pango.Units.FromPixels (VerticalTextSize); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs index 28c94b36e5..1a54f5e800 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs @@ -1,4 +1,4 @@ -// +// // DockBarItem.cs // // Author: @@ -38,6 +38,7 @@ using Xwt.Motion; using Animations = Xwt.Motion.AnimationExtensions; using MonoDevelop.Core; using MonoDevelop.Ide.Fonts; +using MonoDevelop.Ide; namespace MonoDevelop.Components.Docking { @@ -253,7 +254,7 @@ namespace MonoDevelop.Components.Docking label = new Label (it.Label); label.Accessible.SetShouldIgnore (true); label.UseMarkup = true; - label.ModifyFont (FontService.SansFont.CopyModified (Styles.FontScale11)); + label.ModifyFont (IdeServices.FontService.SansFont.CopyModified (Styles.FontScale11)); if (bar.Orientation == Orientation.Vertical) label.Angle = 270; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs index 22d2b6dc89..37de0c34ec 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs @@ -1,4 +1,4 @@ -// +// // MonoDevelop.Components.Docking.cs // // Author: @@ -930,7 +930,7 @@ namespace MonoDevelop.Components.Docking win.Move (p.X, p.Y); win.Resize (width, height); win.Show (); - Ide.DesktopService.AddChildWindow ((Gtk.Window)Toplevel, win); + Ide.IdeServices.DesktopService.AddChildWindow ((Gtk.Window)Toplevel, win); win.AcceptFocus = true; win.Opacity = 1.0; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrameTopLevel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrameTopLevel.cs index 0f2a5fa8a9..2b9350a92d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrameTopLevel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrameTopLevel.cs @@ -1,4 +1,4 @@ -// +// // DockFrameTopLevel.cs // // Author: @@ -130,7 +130,7 @@ namespace MonoDevelop.Components.Docking repositionRequested = true; Application.Invoke ((o, args) => { var pos = frame.GetScreenCoordinates (new Gdk.Point (x, y)); - DesktopService.PlaceWindow (ContainerWindow, pos.X, pos.Y, width, height); + IdeServices.DesktopService.PlaceWindow (ContainerWindow, pos.X, pos.Y, width, height); repositionRequested = false; }); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs index 428943c8ae..7929b104cc 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs @@ -1,4 +1,4 @@ -// +// // DockItem.cs // // Author: @@ -455,7 +455,7 @@ namespace MonoDevelop.Components.Docking }; } floatingWindow.Show (); - Ide.DesktopService.PlaceWindow (floatingWindow, rect.X, rect.Y, rect.Width, rect.Height); + Ide.IdeServices.DesktopService.PlaceWindow (floatingWindow, rect.X, rect.Y, rect.Width, rect.Height); if (titleTab != null) titleTab.UpdateBehavior (); Widget.Show (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs index d4532109ac..a12c733f75 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs @@ -1,4 +1,4 @@ -// +// // DockItemTitleTab.cs // // Author: @@ -195,7 +195,7 @@ namespace MonoDevelop.Components.Docking } if (IsRealized && labelWidget?.Visible == true) { - var font = FontService.SansFont.CopyModified (null, Pango.Weight.Bold); + var font = IdeServices.FontService.SansFont.CopyModified (null, Pango.Weight.Bold); font.AbsoluteSize = Pango.Units.FromPixels (11); labelWidget.ModifyFont (font); labelWidget.ModifyText (StateType.Normal, (active ? visualStyle.PadTitleLabelColor.Value : visualStyle.InactivePadTitleLabelColor.Value).ToGdkColor ()); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs index 562ec03168..573d5b690d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs @@ -67,7 +67,7 @@ namespace MonoDevelop.Components.MainToolbar // We only want to check it here if it's not part // of the open combine. Otherwise, it will get // checked down below. - if (doc.Project == null && doc.IsFile) { + if (doc.Owner == null && doc.IsFile) { var pf = new ProjectFile (doc.Name); list.Add (new Tuple<string, string, ProjectFile> (System.IO.Path.GetFileName (pf.FilePath), FileSearchResult.GetRelProjectPath (pf), pf)); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs index d0646e9784..ea36fc1404 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs @@ -1,4 +1,4 @@ -// +// // MainToolbar.cs // // Author: @@ -283,7 +283,7 @@ namespace MonoDevelop.Components.MainToolbar { if (evnt.Button == 1 && evnt.Window == GdkWindow) { var window = (Gtk.Window)Toplevel; - if (!DesktopService.GetIsFullscreen (window)) { + if (!IdeServices.DesktopService.GetIsFullscreen (window)) { window.BeginMoveDrag (1, (int)evnt.XRoot, (int)evnt.YRoot, evnt.Time); return true; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoslynSearchCategory.DeclaredSymbolInfoResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoslynSearchCategory.DeclaredSymbolInfoResult.cs index 290e223637..2ba7636640 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoslynSearchCategory.DeclaredSymbolInfoResult.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoslynSearchCategory.DeclaredSymbolInfoResult.cs @@ -132,11 +132,11 @@ namespace MonoDevelop.Components.MainToolbar var filePath = result.NavigableItem.Document.FilePath;
var offset = result.NavigableItem.SourceSpan.Start;
- var proj = TypeSystemService.GetMonoProject (result.NavigableItem.Document.Project);
+ var proj = IdeApp.TypeSystemService.GetMonoProject (result.NavigableItem.Document.Project);
if (proj?.ParentSolution != null) {
string projectedName;
int projectedOffset;
- if (TypeSystemService.GetWorkspace (proj.ParentSolution).TryGetOriginalFileFromProjection (filePath, offset, out projectedName, out projectedOffset)) {
+ if (IdeApp.TypeSystemService.GetWorkspace (proj.ParentSolution).TryGetOriginalFileFromProjection (filePath, offset, out projectedName, out projectedOffset)) {
filePath = projectedName;
offset = projectedOffset;
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoslynSearchCategory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoslynSearchCategory.cs index c2b5c9558a..7130446930 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoslynSearchCategory.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoslynSearchCategory.cs @@ -161,7 +161,7 @@ namespace MonoDevelop.Components.MainToolbar try {
var kinds = GetTagKinds (searchPattern.Tag);
// Maybe use language services instead of AbstractNavigateToSearchService
- var aggregatedResults = await Task.WhenAll (TypeSystemService.AllWorkspaces
+ var aggregatedResults = await Task.WhenAll (IdeApp.TypeSystemService.AllWorkspaces
.Select (ws => ws.CurrentSolution)
.SelectMany (sol => sol.Projects)
.Select (async proj => {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs index f6585347ff..5ef61ef0ed 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs @@ -1,4 +1,4 @@ -// +// // NavigateToDialog.cs // // Author: @@ -163,7 +163,7 @@ namespace MonoDevelop.Components.MainToolbar public override Xwt.Drawing.Image Icon { get { - return DesktopService.GetIconForFile (file.FilePath, IconSize.Menu); + return IdeServices.DesktopService.GetIconForFile (file.FilePath, IconSize.Menu); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs index effa7f914f..411568203d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs @@ -1,4 +1,4 @@ -// +// // StatusArea.cs // // Author: @@ -318,7 +318,7 @@ namespace MonoDevelop.Components.MainToolbar TaskEventHandler updateHandler = delegate { int ec=0, wc=0; - foreach (TaskListEntry t in TaskService.Errors) { + foreach (TaskListEntry t in IdeServices.TaskService.Errors) { if (t.Severity == TaskSeverity.Error) ec++; else if (t.Severity == TaskSeverity.Warning) @@ -326,7 +326,7 @@ namespace MonoDevelop.Components.MainToolbar } - using (var font = FontService.SansFont.CopyModified (MonoDevelop.Ide.Gui.Styles.FontScale11)) { + using (var font = IdeServices.FontService.SansFont.CopyModified (MonoDevelop.Ide.Gui.Styles.FontScale11)) { errors.Visible = ec > 0; errors.ModifyFont (font); errors.Text = ec.ToString (); @@ -345,15 +345,15 @@ namespace MonoDevelop.Components.MainToolbar updateHandler (null, null); - TaskService.Errors.TasksAdded += updateHandler; - TaskService.Errors.TasksRemoved += updateHandler; + IdeServices.TaskService.Errors.TasksAdded += updateHandler; + IdeServices.TaskService.Errors.TasksRemoved += updateHandler; currentApplicationName = BrandingService.ApplicationLongName; BrandingService.ApplicationNameChanged += ApplicationNameChanged; box.Destroyed += delegate { - TaskService.Errors.TasksAdded -= updateHandler; - TaskService.Errors.TasksRemoved -= updateHandler; + IdeServices.TaskService.Errors.TasksAdded -= updateHandler; + IdeServices.TaskService.Errors.TasksRemoved -= updateHandler; BrandingService.ApplicationNameChanged -= ApplicationNameChanged; }; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsEditorCell.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsEditorCell.cs index 272cb84f54..7510e1dcee 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsEditorCell.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsEditorCell.cs @@ -1,4 +1,4 @@ -// +// // FlagsEditorCell.cs // // Author: @@ -31,6 +31,7 @@ using System; using System.Collections; using System.ComponentModel; using MonoDevelop.Ide.Fonts; +using MonoDevelop.Ide; namespace MonoDevelop.Components.PropertyGrid.PropertyEditors { @@ -96,7 +97,7 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors { var container = (Widget)Container; using (var layout = new Pango.Layout (container.PangoContext)) {
layout.Width = -1;
- layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
+ layout.FontDescription = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
ulong value = Convert.ToUInt64 (Value);
int dy = 2;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs index 16a780f73d..3d9e8cdce6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs @@ -1,4 +1,4 @@ -// +// // PropertyEditorCell.cs // // Author: @@ -32,6 +32,7 @@ using Gdk; using Gtk; using MonoDevelop.Ide.Fonts; using MonoDevelop.Core; +using MonoDevelop.Ide; namespace MonoDevelop.Components.PropertyGrid { @@ -72,7 +73,7 @@ namespace MonoDevelop.Components.PropertyGrid } layout = new Pango.Layout (container.PangoContext); layout.Width = -1; - layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); + layout.FontDescription = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); this.context = context; Initialize (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs index 2a8477da80..3a23f70e0f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs @@ -1,4 +1,4 @@ -/*
+/*
* PropertyGrid.cs - A Gtk# widget that displays and allows
* editing of all of an object's public properties
*
@@ -45,6 +45,7 @@ using MonoDevelop.Components.PropertyGrid.PropertyEditors; using System.Collections.Generic;
using System.Linq;
using MonoDevelop.Ide.Fonts; +using MonoDevelop.Ide; namespace MonoDevelop.Components.PropertyGrid { @@ -388,7 +389,7 @@ namespace MonoDevelop.Components.PropertyGrid descTextView.Editable = false;
descTextView.LeftMargin = 5;
descTextView.RightMargin = 5; - descTextView.ModifyFont (FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11));
+ descTextView.ModifyFont (IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11));
textScroll.Add (descTextView);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs index 6f632e0c51..49d92992b6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs @@ -1,4 +1,4 @@ -// +// // ContextMenuExtensionsMac.cs // // Author: @@ -86,7 +86,7 @@ namespace MonoDevelop.Components if (toplevel.TypeHint == Gdk.WindowTypeHint.Toolbar && toplevel.Type == Gtk.WindowType.Toplevel && toplevel.Decorated == false) { // Undecorated toplevel toolbars are used for auto-hide pad windows. Don't add a titlebar offset for them. titleBarOffset = 0; - } else if (MonoDevelop.Ide.DesktopService.GetIsFullscreen (toplevel)) { + } else if (MonoDevelop.Ide.IdeServices.DesktopService.GetIsFullscreen (toplevel)) { titleBarOffset = 0; } else { titleBarOffset = MonoDevelop.Components.Mac.GtkMacInterop.GetTitleBarHeight () + 12; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs index 9c950c757a..4b5a9b9f91 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs @@ -1,4 +1,4 @@ -// +// // DropDownBox.cs // // Author: @@ -141,7 +141,7 @@ namespace MonoDevelop.Components window.WidthRequest = Allocation.Width; int width, height; window.GetSizeRequest (out width, out height); - Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (dx, dy)); + Xwt.Rectangle geometry = IdeServices.DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (dx, dy)); if (dy + height > geometry.Bottom) dy = oy + this.Allocation.Y - height; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs index 13028e8b00..d8594f9307 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs @@ -1,4 +1,4 @@ -// +// // DropDownBoxListWindow.cs // // Author: @@ -601,7 +601,7 @@ namespace MonoDevelop.Components layout.Dispose (); layout = new Pango.Layout (PangoContext); layout.Wrap = Pango.WrapMode.Char; - layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); + layout.FontDescription = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); CalcRowHeight (); CalcVisibleRows (); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDLinkMenuItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDLinkMenuItem.cs index 69b086607a..f3ceca2553 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDLinkMenuItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDLinkMenuItem.cs @@ -1,4 +1,4 @@ -// +// // MDLinkMenuItem.cs // // Author: @@ -47,7 +47,7 @@ namespace MonoDevelop.Components.Mac [Export (MDMenuItem.ActionSelName)] public void Run (NSObject dummy) { - MonoDevelop.Ide.DesktopService.ShowUrl (lce.Url); + MonoDevelop.Ide.IdeServices.DesktopService.ShowUrl (lce.Url); } public void Update (MDMenu parent, ref int index) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenuItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenuItem.cs index 0cfd445fc0..0e60209254 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenuItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenuItem.cs @@ -1,4 +1,4 @@ -// +// // MDMenuItem.cs // // Author: @@ -97,7 +97,7 @@ namespace MonoDevelop.Components.Mac // We can justify this because safari 3.2.1 does it ("do you want to close all tabs?"). public static bool IsGloballyDisabled { get { - return MonoDevelop.Ide.DesktopService.IsModalDialogRunning (); + return MonoDevelop.Ide.IdeServices.DesktopService.IsModalDialogRunning (); } } @@ -241,7 +241,7 @@ namespace MonoDevelop.Components.Mac if (!info.Icon.IsNull) icon = Ide.ImageService.GetIcon (info.Icon, Gtk.IconSize.Menu); if (icon == null) - icon = Ide.DesktopService.GetIconForFile (fileName, Gtk.IconSize.Menu); + icon = Ide.IdeServices.DesktopService.GetIconForFile (fileName, Gtk.IconSize.Menu); if (icon != null) { var scale = GtkWorkarounds.GetScaleFactor (Ide.IdeApp.Workbench.RootWindow); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs index dfcdd9d9fd..b7b3eb7b4d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs @@ -1,4 +1,4 @@ -// +// // PathBar.cs // // Author: @@ -387,7 +387,7 @@ namespace MonoDevelop.Components } layout.Attributes = (i == activeIndex) ? boldAtts : null; - layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11); + layout.FontDescription = IdeServices.FontService.SansFont.CopyModified (Styles.FontScale11); layout.SetMarkup (GetFirstLineFromMarkup (leftPath [i].Markup)); ctx.Save (); @@ -452,7 +452,7 @@ namespace MonoDevelop.Components } layout.Attributes = (i == activeIndex) ? boldAtts : null; - layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11); + layout.FontDescription = IdeServices.FontService.SansFont.CopyModified (Styles.FontScale11); layout.SetMarkup (GetFirstLineFromMarkup (rightPath [i].Markup)); ctx.Save (); @@ -684,7 +684,7 @@ namespace MonoDevelop.Components var req = widget.SizeRequest (); - Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (dx, dy)); + Xwt.Rectangle geometry = IdeServices.DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (dx, dy)); int geomWidth = (int)geometry.Width; int geomLeft = (int)geometry.Left; int geomRight = (int)geometry.Right; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs index d2ad2099d5..5bab3d7827 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs @@ -1,4 +1,4 @@ -// +// // SearchPopupWindow.cs // // Author: @@ -400,7 +400,7 @@ namespace MonoDevelop.Components Move (x, y); Show (); if (!ShowWindowShadow) - DesktopService.RemoveWindowShadow (this); + IdeServices.DesktopService.RemoveWindowShadow (this); } public bool SupportsAlpha { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs index e0803887c0..25d1017485 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs @@ -1,4 +1,4 @@ -// +// // SearchEntry.cs // // Author: @@ -33,6 +33,7 @@ using MonoDevelop.Core; using MonoDevelop.Ide.Fonts; using MonoDevelop.Ide.Gui; using MonoDevelop.Components.AtkCocoaHelper; +using MonoDevelop.Ide; namespace MonoDevelop.Components { @@ -782,7 +783,7 @@ namespace MonoDevelop.Components if (layout == null) { layout = new Pango.Layout (PangoContext); - layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11); + layout.FontDescription = IdeServices.FontService.SansFont.CopyModified (Styles.FontScale11); } int width, height; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs index dfa4390f5d..c3304ae49a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs @@ -1,4 +1,4 @@ -// +// // TooltipPopoverWindow.cs // // Author: @@ -26,6 +26,7 @@ // THE SOFTWARE. using System; using MonoDevelop.Core; +using MonoDevelop.Ide; using MonoDevelop.Ide.Fonts; using MonoDevelop.Ide.Gui; using MonoDevelop.Ide.Tasks; @@ -58,7 +59,7 @@ namespace MonoDevelop.Components public TooltipPopoverWindow () : base (PopupType.Tooltip) { Theme.SetBackgroundColor (Styles.PopoverWindow.DefaultBackgroundColor); - Theme.Font = Xwt.Drawing.Font.FromName (FontService.SansFontName).WithScaledSize (Styles.FontScale11); + Theme.Font = Xwt.Drawing.Font.FromName (IdeServices.FontService.SansFontName).WithScaledSize (Styles.FontScale11); ShowArrow = true; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs index f2cfc14f3a..8faf5d5e2f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs @@ -1,4 +1,4 @@ -// +// // TooltipWindow.cs // // Author: @@ -116,7 +116,7 @@ namespace MonoDevelop.Components // LimitWidth (fittedWidth); // } - Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (x, y)); + Xwt.Rectangle geometry = IdeServices.DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (x, y)); int left = (int)geometry.Left; int top = (int)geometry.Top; int width = (int)geometry.Width; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputTreeCellView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputTreeCellView.cs index 4f2b2d2b1d..e055a25774 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputTreeCellView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputTreeCellView.cs @@ -405,7 +405,7 @@ namespace MonoDevelop.Ide.BuildOutputView .WithSize (FontSize);
defaultBoldFont = fontName.WithWeight (FontWeight.Bold);
defaultFont = fontName.WithWeight (FontWeight.Normal);
- monospaceFont = FontService.MonospaceFont.ToXwtFont ().WithSize (FontSize);
+ monospaceFont = IdeServices.FontService.MonospaceFont.ToXwtFont ().WithSize (FontSize);
}
public BuildOutputTreeCellView (IBuildOutputContextProvider context)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindowGtk.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindowGtk.cs index 3df5e1b3ea..eb9ff8f2a3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindowGtk.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindowGtk.cs @@ -224,7 +224,7 @@ namespace MonoDevelop.Ide.CodeCompletion return; // Note: we add back the TextOffset here in case X and X+TextOffset are on different monitors. - Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (X + TextOffset, Y)); + Xwt.Rectangle geometry = IdeServices.DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (X + TextOffset, Y)); previousHeight = h; previousWidth = w; @@ -323,7 +323,7 @@ namespace MonoDevelop.Ide.CodeCompletion void ICompletionView.Show () { ShowAll (); - DesktopService.RemoveWindowShadow (this); + IdeServices.DesktopService.RemoveWindowShadow (this); } public void ShowPreviewCompletionEntry () diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs index 25c9b6aac2..eb60efdfbf 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs @@ -1,4 +1,4 @@ -// +// // ListWidget.cs // // Author: @@ -154,9 +154,9 @@ namespace MonoDevelop.Ide.CodeCompletion if (noMatchFont != null) noMatchFont.Dispose (); - itemFont = FontService.MonospaceFont.Copy (); - categoryFont = FontService.SansFont.CopyModified (Styles.FontScale11); - noMatchFont = FontService.SansFont.CopyModified (Styles.FontScale11); + itemFont = IdeServices.FontService.MonospaceFont.Copy (); + categoryFont = IdeServices.FontService.SansFont.CopyModified (Styles.FontScale11); + noMatchFont = IdeServices.FontService.SansFont.CopyModified (Styles.FontScale11); var newItemFontSize = itemFont.Size; var newCategoryFontSize = categoryFont.Size; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs index 546f9ab87f..e43ace4010 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs @@ -1,4 +1,4 @@ -// ParameterInformationWindow.cs +// ParameterInformationWindow.cs // // Author: // Lluis Sanchez Gual <lluis@novell.com> @@ -94,7 +94,7 @@ namespace MonoDevelop.Ide.CodeCompletion IdeApp.Preferences.ColorScheme.Changed += HandleThemeChanged; vb2.ShowAll (); - //DesktopService.RemoveWindowShadow (this); + //IdeServices.DesktopService.RemoveWindowShadow (this); Content.BoundsChanged += Content_BoundsChanged; } @@ -160,12 +160,12 @@ namespace MonoDevelop.Ide.CodeCompletion scheme = SyntaxHighlightingService.GetDefaultColorStyle (IdeApp.Preferences.UserInterfaceTheme); Theme.SetSchemeColors (scheme); - Theme.Font = FontService.SansFont.CopyModified (Styles.FontScale11).ToXwtFont (); + Theme.Font = IdeServices.FontService.SansFont.CopyModified (Styles.FontScale11).ToXwtFont (); Theme.ShadowColor = Styles.PopoverWindow.ShadowColor; foreColor = Styles.PopoverWindow.DefaultTextColor.ToCairoColor (); headlabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ()); - headlabel.FontDescription = FontService.GetFontDescription ("Editor").CopyModified (Styles.FontScale11); + headlabel.FontDescription = IdeServices.FontService.GetFontDescription ("Editor").CopyModified (Styles.FontScale11); //if (this.Visible) // QueueDraw (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/SignatureHelpParameterHintingData.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/SignatureHelpParameterHintingData.cs index 3a30610968..0c2f8f399a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/SignatureHelpParameterHintingData.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/SignatureHelpParameterHintingData.cs @@ -130,7 +130,7 @@ namespace MonoDevelop.Ide.CodeCompletion if (documentation.Count > 0) { markup.Append ("<span font='"); - markup.Append (FontService.SansFontName); + markup.Append (IdeServices.FontService.SansFontName); markup.Append ("' size='small'>"); markup.AppendLine (); markup.AppendLine (); @@ -149,7 +149,7 @@ namespace MonoDevelop.Ide.CodeCompletion } if (documentation.Count > 0) { markup.Append ("<span font='"); - markup.Append (FontService.SansFontName); + markup.Append (IdeServices.FontService.SansFontName); markup.Append ("' size='small'>"); markup.AppendLine (); markup.AppendLine (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs index 35bc051ecd..74bad6d290 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs @@ -1,4 +1,4 @@ -// TooltipInformationWindow.cs +// TooltipInformationWindow.cs // // Author: // Mike Krüger <mkrueger@novell.com> @@ -265,8 +265,8 @@ namespace MonoDevelop.Ide.CodeCompletion Theme.SetSchemeColors (scheme); foreColor = Styles.PopoverWindow.DefaultTextColor.ToCairoColor (); headLabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ()); - headLabel.FontDescription = FontService.GetFontDescription ("Editor").CopyModified (Styles.FontScale11); - Theme.Font = FontService.SansFont.CopyModified (Styles.FontScale11).ToXwtFont (); + headLabel.FontDescription = IdeServices.FontService.GetFontDescription ("Editor").CopyModified (Styles.FontScale11); + Theme.Font = IdeServices.FontService.SansFont.CopyModified (Styles.FontScale11).ToXwtFont (); Theme.ShadowColor = Styles.PopoverWindow.ShadowColor; if (this.Visible) ShowOverload (); 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 22a9a4ec2b..4684592772 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatterService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormatterService.cs @@ -1,4 +1,4 @@ -// +// // CodeFormatterService.cs // // Author: @@ -57,14 +57,14 @@ namespace MonoDevelop.Ide.CodeFormatting public static CodeFormatter GetFormatter (string mimeType) {
- //find the most specific formatter that can handle the document
var chain = DesktopService.GetMimeTypeInheritanceChain (mimeType); + //find the most specific formatter that can handle the document
var chain = IdeServices.DesktopService.GetMimeTypeInheritanceChain (mimeType); foreach (var mt in chain) { var node = nodes.FirstOrDefault (f => f.MimeType == mt); if (node != null) return new CodeFormatter (mimeType, node.GetFormatter ()); } - if (DesktopService.GetMimeTypeIsText (mimeType)) + if (IdeServices.DesktopService.GetMimeTypeIsText (mimeType)) return new CodeFormatter (mimeType, new DefaultCodeFormatter ()); return null; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs index e3eee2c597..068c391f2f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs @@ -1,4 +1,4 @@ -// +// // CodeTemplateService.cs // // Author: @@ -97,7 +97,7 @@ namespace MonoDevelop.Ide.CodeTemplates return new CodeTemplate [0]; return savedTemplates.ToArray ().Where (delegate (CodeTemplate t) { try { - return t != null && DesktopService.GetMimeTypeIsSubtype (mimeType, t.MimeType); + return t != null && IdeServices.DesktopService.GetMimeTypeIsSubtype (mimeType, t.MimeType); } catch (Exception) { // required for some unit tests return t != null && mimeType == t.MimeType; @@ -224,12 +224,12 @@ namespace MonoDevelop.Ide.CodeTemplates public static IEnumerable<CodeTemplate> GetCodeTemplatesForFile (string fileName) { - return GetCodeTemplates (DesktopService.GetMimeTypeForUri (fileName)); + return GetCodeTemplates (IdeServices.DesktopService.GetMimeTypeForUri (fileName)); } public static void AddCompletionDataForFileName (string fileName, CompletionDataList list) { - AddCompletionDataForMime (DesktopService.GetMimeTypeForUri (fileName), list); + AddCompletionDataForMime (IdeServices.DesktopService.GetMimeTypeForUri (fileName), list); } public static void AddCompletionDataForMime (string mimeType, CompletionDataList list) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs index 73fd92e947..edf7c4ecb6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs @@ -1,4 +1,4 @@ -// +// // ExpansionObject.cs // // Author: @@ -181,7 +181,7 @@ namespace MonoDevelop.Ide.CodeTemplates return empty; //var result = new List<CodeTemplateVariableValue> (); //var ext = CurrentContext.DocumentContext.GetContent <CompletionTextEditorExtension> (); - //var analysisProject = TypeSystemService.GetCodeAnalysisProject (CurrentContext.DocumentContext.Project); + //var analysisProject = IdeApp.TypeSystemService.GetCodeAnalysisProject (CurrentContext.DocumentContext.Project); //var compilation = analysisProject != null ? analysisProject.GetCompilationAsync ().Result : null; //if (ext != null) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs index c81c15ae14..a3ad7cc5d6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs @@ -356,7 +356,7 @@ namespace MonoDevelop.Ide.Commands protected override void Run () { Document doc = IdeApp.Workbench.ActiveDocument; - string header = MonoDevelop.Ide.StandardHeader.StandardHeaderService.GetHeader (doc.Project, doc.Name, false); + string header = MonoDevelop.Ide.StandardHeader.StandardHeaderService.GetHeader (doc.Owner as SolutionFolderItem, doc.Name, false); doc.Editor.InsertText (0, header + "\n"); } 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 034e335011..414a354ff8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs @@ -1,4 +1,4 @@ -// NewFileCommands.cs +// NewFileCommands.cs // // Author: // Carlo Kok (ck@remobjects.com) @@ -154,7 +154,7 @@ namespace MonoDevelop.Ide.Commands { try { isRunning = true; - await IdeApp.Workbench.CloseAllDocumentsAsync (false); + await IdeApp.Workbench.CloseAllDocuments (false); } finally { isRunning = false; } @@ -276,7 +276,7 @@ namespace MonoDevelop.Ide.Commands { protected override void Update (CommandArrayInfo info) { - var files = DesktopService.RecentFiles.GetFiles (); + var files = IdeServices.DesktopService.RecentFiles.GetFiles (); if (files.Count == 0) return; @@ -291,7 +291,7 @@ namespace MonoDevelop.Ide.Commands var cmd = new CommandInfo (commandText) { Description = string.Format (descFormat, ri.FileName) }; -/* Gdk.Pixbuf icon = DesktopService.GetIconForFile (ri.FileName, IconSize.Menu); +/* Gdk.Pixbuf icon = IdeServices.DesktopService.GetIconForFile (ri.FileName, IconSize.Menu); #pragma warning disable 618 if (icon != null) cmd.Icon = ImageService.GetStockId (icon, IconSize.Menu); @@ -321,7 +321,7 @@ namespace MonoDevelop.Ide.Commands question, AlertButton.No, AlertButton.Yes) == AlertButton.Yes) { - DesktopService.RecentFiles.ClearFiles (); + IdeServices.DesktopService.RecentFiles.ClearFiles (); } } catch (Exception ex) { LoggingService.LogError ("Error clearing recent files list", ex); @@ -330,7 +330,7 @@ namespace MonoDevelop.Ide.Commands protected override void Update (CommandInfo info) { - info.Enabled = DesktopService.RecentFiles.GetFiles ().Count > 0; + info.Enabled = IdeServices.DesktopService.RecentFiles.GetFiles ().Count > 0; } } @@ -339,7 +339,7 @@ namespace MonoDevelop.Ide.Commands { protected override void Update (CommandArrayInfo info) { - var projects = DesktopService.RecentFiles.GetProjects (); + var projects = IdeServices.DesktopService.RecentFiles.GetProjects (); if (projects.Count == 0) return; @@ -353,7 +353,7 @@ namespace MonoDevelop.Ide.Commands if (!File.Exists (ri.FileName)) continue; - icon = IdeApp.Services.ProjectService.FileIsObjectOfType (ri.FileName, typeof(Solution)) ? "md-solution": "md-workspace"; + icon = IdeServices.ProjectService.FileIsObjectOfType (ri.FileName, typeof(Solution)) ? "md-solution": "md-workspace"; } catch (UnauthorizedAccessException exAccess) { LoggingService.LogWarning ("Error building recent solutions list (Permissions)", exAccess); @@ -406,7 +406,7 @@ namespace MonoDevelop.Ide.Commands question, AlertButton.No, AlertButton.Yes) == AlertButton.Yes) { - DesktopService.RecentFiles.ClearProjects (); + IdeServices.DesktopService.RecentFiles.ClearProjects (); } } catch (Exception ex) { LoggingService.LogError ("Error clearing recent projects list", ex); @@ -415,7 +415,7 @@ namespace MonoDevelop.Ide.Commands protected override void Update (CommandInfo info) { - info.Enabled = DesktopService.RecentFiles.GetProjects ().Count > 0; + info.Enabled = IdeServices.DesktopService.RecentFiles.GetProjects ().Count > 0; } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileTabCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileTabCommands.cs index 42f3674a04..5e8b91563e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileTabCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileTabCommands.cs @@ -1,4 +1,4 @@ -// +// // FileTabCommands.cs // // Author: @@ -36,6 +36,8 @@ using MonoDevelop.Ide.Navigation; using MonoDevelop.Core; using System.Linq; using MonoDevelop.Ide.Gui.Dialogs; +using MonoDevelop.Ide.Gui.Documents; +using MonoDevelop.Ide.Gui.Shell; namespace MonoDevelop.Ide.Commands { @@ -50,7 +52,7 @@ namespace MonoDevelop.Ide.Commands class CloseAllHandler : CommandHandler { - protected virtual ViewContent GetDocumentException () + protected virtual Document GetDocumentException () { return null; } @@ -65,7 +67,7 @@ namespace MonoDevelop.Ide.Commands var except = GetDocumentException (); var docs = IdeApp.Workbench.Documents - .Where (doc => ((SdiWorkspaceWindow)doc.Window).TabControl == activeNotebook && (except == null || doc.Window.ViewContent != except)) + .Where (doc => ((SdiWorkspaceWindow)doc.Window).TabControl == activeNotebook && (except == null || doc != except)) .ToArray (); var dirtyDialogShown = docs.Count (doc => doc.IsDirty) > 1; @@ -78,7 +80,7 @@ namespace MonoDevelop.Ide.Commands foreach (Document doc in docs) if (dirtyDialogShown) - doc.Window.CloseWindow (true); + doc.Close (true).Ignore (); else doc.Close ().Ignore(); } @@ -86,10 +88,9 @@ namespace MonoDevelop.Ide.Commands class CloseAllButThisHandler : CloseAllHandler { - protected override ViewContent GetDocumentException () + protected override Document GetDocumentException () { - var active = IdeApp.Workbench.ActiveDocument; - return active == null ? null : active.Window.ViewContent; + return IdeApp.Workbench.ActiveDocument; } } @@ -122,12 +123,12 @@ namespace MonoDevelop.Ide.Commands { protected override void Run () { - NavigationHistoryService.OpenLastClosedDocument (); + IdeServices.NavigationHistoryService.OpenLastClosedDocument (); } protected override void Update (CommandInfo info) { - info.Enabled = NavigationHistoryService.HasClosedDocuments; + info.Enabled = IdeServices.NavigationHistoryService.HasClosedDocuments; } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs index ae9f49659c..4adae2a98d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs @@ -1,4 +1,4 @@ -// NavigationCommands.cs +// NavigationCommands.cs // // Author: // Jeffrey Stedfast <fejj@novell.com> @@ -48,12 +48,12 @@ namespace MonoDevelop.Ide.Commands { protected override void Run () { - NavigationHistoryService.MoveBack (); + IdeServices.NavigationHistoryService.MoveBack (); } protected override void Update (CommandInfo info) { - info.Enabled = NavigationHistoryService.CanMoveBack; + info.Enabled = IdeServices.NavigationHistoryService.CanMoveBack; } } @@ -61,12 +61,12 @@ namespace MonoDevelop.Ide.Commands { protected override void Run () { - NavigationHistoryService.MoveForward (); + IdeServices.NavigationHistoryService.MoveForward (); } protected override void Update (CommandInfo info) { - info.Enabled = NavigationHistoryService.CanMoveForward; + info.Enabled = IdeServices.NavigationHistoryService.CanMoveForward; } } @@ -76,13 +76,13 @@ namespace MonoDevelop.Ide.Commands { NavigationHistoryItem nav = ob as NavigationHistoryItem; if (nav != null) - NavigationHistoryService.MoveTo (nav); + IdeServices.NavigationHistoryService.MoveTo (nav); } protected override void Update (CommandArrayInfo info) { int currentIndex; - IList<NavigationHistoryItem> points = NavigationHistoryService.GetNavigationList (15, out currentIndex); + IList<NavigationHistoryItem> points = IdeServices.NavigationHistoryService.GetNavigationList (15, out currentIndex); if (points.Count < 1) { Document doc = IdeApp.Workbench.ActiveDocument; @@ -104,12 +104,12 @@ namespace MonoDevelop.Ide.Commands { protected override void Run () { - NavigationHistoryService.Clear (); + IdeServices.NavigationHistoryService.Clear (); } protected override void Update (CommandInfo info) { - info.Enabled = NavigationHistoryService.CanMoveForward || NavigationHistoryService.CanMoveBack; + info.Enabled = IdeServices.NavigationHistoryService.CanMoveForward || IdeServices.NavigationHistoryService.CanMoveBack; } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs index c129fee76b..cad3a073c6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CustomTools/CustomToolService.cs @@ -1,4 +1,4 @@ -// +// // CustomToolService.cs // // Author: @@ -199,7 +199,7 @@ namespace MonoDevelop.Ide.CustomTools return; } - TaskService.Errors.ClearByOwner (file); + IdeServices.TaskService.Errors.ClearByOwner (file); var result = new SingleFileCustomToolResult (); monitor.BeginTask (GettextCatalog.GetString ("Running generator '{0}' on file '{1}'...", file.Generator, file.Name), 1); @@ -272,7 +272,7 @@ namespace MonoDevelop.Ide.CustomTools return; } - TaskService.Errors.ClearByOwner (file); + IdeServices.TaskService.Errors.ClearByOwner (file); TaskInfo runningTask; TaskCompletionSource<bool> newTask = new TaskCompletionSource<bool> (); @@ -418,7 +418,7 @@ namespace MonoDevelop.Ide.CustomTools if (result.Errors.Count > 0) { Runtime.RunInMainThread (delegate { foreach (CompilerError err in result.Errors) - TaskService.Errors.Add (new TaskListEntry (file.FilePath, err.ErrorText, err.Column, err.Line, + IdeServices.TaskService.Errors.Add (new TaskListEntry (file.FilePath, err.ErrorText, err.Column, err.Line, err.IsWarning? TaskSeverity.Warning : TaskSeverity.Error, TaskPriority.Normal, file.Project.ParentSolution, file)); }); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs index f53f48caaa..5f84a7b3b8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs @@ -1,4 +1,4 @@ -// +// // PlatformService.cs // // Author: @@ -582,7 +582,7 @@ namespace MonoDevelop.Ide.Desktop WorkingDirectory = Environment.CurrentDirectory, }; - var recentWorkspace = reopen ? DesktopService.RecentFiles.GetProjects ().FirstOrDefault ()?.FileName : string.Empty; + var recentWorkspace = reopen ? IdeServices.DesktopService.RecentFiles.GetProjects ().FirstOrDefault ()?.FileName : string.Empty; if (!string.IsNullOrEmpty (recentWorkspace)) psi.Arguments = recentWorkspace; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AbstractBraceMatcher.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AbstractBraceMatcher.cs index 95f8cc7b5e..afc9320832 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AbstractBraceMatcher.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AbstractBraceMatcher.cs @@ -42,7 +42,7 @@ namespace MonoDevelop.Ide.Editor public virtual bool CanHandle (TextEditor editor) { - return DesktopService.GetMimeTypeIsSubtype(editor.MimeType, MimeType); + return IdeServices.DesktopService.GetMimeTypeIsSubtype(editor.MimeType, MimeType); } public abstract Task<BraceMatchingResult?> GetMatchingBracesAsync(IReadonlyTextDocument editor, DocumentContext context, int offset, CancellationToken cancellationToken = default(CancellationToken)); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AutoInsertBracketTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AutoInsertBracketTextEditorExtension.cs index 3d20803edb..79af756444 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AutoInsertBracketTextEditorExtension.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/AutoInsertBracketTextEditorExtension.cs @@ -125,7 +125,7 @@ namespace MonoDevelop.Ide.Editor.Extension } //check mimetypes, from most to least specific - var mimeChain = DesktopService.GetMimeTypeInheritanceChain (editor.MimeType); + var mimeChain = IdeServices.DesktopService.GetMimeTypeInheritanceChain (editor.MimeType); foreach (var mime in mimeChain) { foreach (var node in nodes) { if (!returned.Contains (node) && MatchAny (mime, node.MimeTypes)) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/TagCommentsTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/TagCommentsTextEditorExtension.cs index e85827eabc..9cd018c8e5 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/TagCommentsTextEditorExtension.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/TagCommentsTextEditorExtension.cs @@ -24,25 +24,19 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using System.Linq; -using System.Collections.Generic; using System.Collections.Immutable; using System.Threading; -using System.Threading.Tasks; -using Gtk; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Editor; -using Microsoft.CodeAnalysis.Editor.Implementation.TodoComments; using MonoDevelop.Core; -using MonoDevelop.Core.Text; +using MonoDevelop.Ide.Composition; using MonoDevelop.Ide.TypeSystem; -using MonoDevelop.Projects; namespace MonoDevelop.Ide.Editor.Extension { class TagCommentsTextEditorExtension : TextEditorExtension, IQuickTaskProvider { - ITodoListProvider todoListProvider = Ide.Composition.CompositionManager.GetExportedValue<ITodoListProvider> (); + ITodoListProvider todoListProvider = CompositionManager.Instance.GetExportedValue<ITodoListProvider> (); CancellationTokenSource src = new CancellationTokenSource (); bool isDisposed; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.TextMate/ShowTextMateScopesHandler.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.TextMate/ShowTextMateScopesHandler.cs index 04be27b1bb..11906d5d09 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.TextMate/ShowTextMateScopesHandler.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.TextMate/ShowTextMateScopesHandler.cs @@ -53,7 +53,7 @@ namespace MonoDevelop.Ide.Editor.TextMate var window = new TooltipPopoverWindow (); - window.Markup = "<span font='" + FontService.MonospaceFontName + "'>" + sb.ToString () + "</span>"; + window.Markup = "<span font='" + IdeServices.FontService.MonospaceFontName + "'>" + sb.ToString () + "</span>"; editor.ShowTooltipWindow (window); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.TextMate/TextMateFoldingTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.TextMate/TextMateFoldingTextEditorExtension.cs index e403654c89..0fec0f30a3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.TextMate/TextMateFoldingTextEditorExtension.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.TextMate/TextMateFoldingTextEditorExtension.cs @@ -78,7 +78,7 @@ namespace MonoDevelop.Ide.Editor.TextMate CancellationTokenSource src = new CancellationTokenSource (); void UpdateFoldings (object sender, TextChangeEventArgs e) { - if (TypeSystemService.GetParser (Editor.MimeType) != null || DocumentContext.ParsedDocument != null) + if (IdeApp.TypeSystemService.GetParser (Editor.MimeType) != null || DocumentContext.ParsedDocument != null) return; var scopeStack = Editor.SyntaxHighlighting.GetScopeStackAsync (0, CancellationToken.None).WaitAndGetResult (CancellationToken.None); if (!scopeStack.Any (s => s.Contains ("source"))) 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 db7317a9ee..746ddb8efe 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs @@ -748,7 +748,7 @@ namespace MonoDevelop.Ide.Editor public string FontName { get { - return IdeApp.FontService.FilterFontName (IdeApp.FontService.GetUnderlyingFontName ("Editor")); + return IdeServices.FontService.FilterFontName (IdeServices.FontService.GetUnderlyingFontName ("Editor")); } set { throw new InvalidOperationException ("Set font through font service"); @@ -757,7 +757,7 @@ namespace MonoDevelop.Ide.Editor public string GutterFontName { get { - return IdeApp.FontService.FilterFontName (IdeApp.FontService.GetUnderlyingFontName ("Editor")); + return IdeServices.FontService.FilterFontName (IdeServices.FontService.GetUnderlyingFontName ("Editor")); } set { throw new InvalidOperationException ("Set font through font service"); @@ -851,7 +851,7 @@ namespace MonoDevelop.Ide.Editor public void Dispose () { - IdeApp.FontService.RemoveCallback (UpdateFont); + IdeServices.FontService.RemoveCallback (UpdateFont); IdeApp.Preferences.ColorScheme.Changed -= OnColorSchemeChanged; if (context != null) context.CodingConventionsChangedAsync -= UpdateContextOptions; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentContext.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentContext.cs index 862dd3adfd..3ba5fc2762 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentContext.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DocumentContext.cs @@ -91,7 +91,7 @@ namespace MonoDevelop.Ide.Editor public Microsoft.CodeAnalysis.Workspace RoslynWorkspace { - get { return TypeSystemService.GetWorkspace (workspaceId); } + get { return IdeApp.TypeSystemService.GetWorkspace (workspaceId); } protected set { workspaceId = ((MonoDevelopWorkspace)value).Id; } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedDocumentContext.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedDocumentContext.cs index 6b7ad693c8..aef67b15c3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedDocumentContext.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedDocumentContext.cs @@ -71,9 +71,9 @@ namespace MonoDevelop.Ide.Editor.Projection this.originalContext = originalContext; if (originalContext.Project != null) { - var originalProjectId = TypeSystemService.GetProjectId (originalContext.Project); + var originalProjectId = IdeApp.TypeSystemService.GetProjectId (originalContext.Project); if (originalProjectId != null) { - var originalProject = TypeSystemService.Workspace.CurrentSolution.GetProject (originalProjectId); + var originalProject = IdeApp.TypeSystemService.Workspace.CurrentSolution.GetProject (originalProjectId); if (originalProject != null) { projectedDocument = originalProject.AddDocument ( projectedEditor.FileName, @@ -111,7 +111,7 @@ namespace MonoDevelop.Ide.Editor.Projection RoslynDocument = projectedDocument, OldParsedDocument = parsedDocument }; - var result = await TypeSystemService.ParseFile (options, projectedEditor.MimeType).ConfigureAwait (false); + var result = await IdeApp.TypeSystemService.ParseFile (options, projectedEditor.MimeType).ConfigureAwait (false); await Runtime.RunInMainThread (delegate { parsedDocument = result; base.OnDocumentParsed (EventArgs.Empty); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs index 762027857a..a4910bf5ba 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs @@ -1,4 +1,4 @@ -// +// // FileProvider.cs // // Author: @@ -166,7 +166,7 @@ namespace MonoDevelop.Ide.FindInFiles Task<Document> SearchDocument () { string fullPath = Path.GetFullPath (FileName); - return Runtime.RunInMainThread (() => IdeApp.Workbench.Documents.FirstOrDefault (d => !string.IsNullOrEmpty (d.FileName) && Path.GetFullPath (d.FileName) == fullPath)); + return Runtime.RunInMainThread (() => IdeServices.DocumentManager.Documents.FirstOrDefault (d => !string.IsNullOrEmpty (d.FileName) && Path.GetFullPath (d.FileName) == fullPath)); } Document document; @@ -215,9 +215,9 @@ namespace MonoDevelop.Ide.FindInFiles return; } if (buffer != null && somethingReplaced) { - object attributes = DesktopService.GetFileAttributes (FileName); + object attributes = IdeServices.DesktopService.GetFileAttributes (FileName); TextFileUtility.WriteText (FileName, buffer.ToString (), encoding ?? Encoding.UTF8); - DesktopService.SetFileAttributes (FileName, attributes); + IdeServices.DesktopService.SetFileAttributes (FileName, attributes); } buffer = null; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs index 19a08d442f..a632fcdd90 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs @@ -1,4 +1,4 @@ -// +// // Scope.cs // // Author: @@ -78,7 +78,7 @@ namespace MonoDevelop.Ide.FindInFiles monitor.Log.WriteLine (GettextCatalog.GetString ("Looking in '{0}'", IdeApp.Workbench.ActiveDocument.FileName)); var doc = IdeApp.Workbench.ActiveDocument; if (doc.Editor != null) - yield return new OpenFileProvider (doc.Editor, doc.Project); + yield return new OpenFileProvider (doc.Editor, doc.Owner as Project); } public override string GetDescription(FilterOptions filterOptions, string pattern, string replacePattern) @@ -106,7 +106,7 @@ namespace MonoDevelop.Ide.FindInFiles var doc = IdeApp.Workbench.ActiveDocument; if (doc.Editor != null) { var selection = doc.Editor.SelectionRange; - yield return new OpenFileProvider (doc.Editor, doc.Project, selection.Offset, selection.EndOffset); + yield return new OpenFileProvider (doc.Editor, doc.Owner as Project, selection.Offset, selection.EndOffset); } } @@ -146,7 +146,7 @@ namespace MonoDevelop.Ide.FindInFiles () => new List<FileProvider> (), (folder, loop, providers) => { foreach (var file in folder.Files.Where (f => filterOptions.NameMatches (f.FileName) && File.Exists (f.FullPath))) { - if (!DesktopService.GetFileIsText (file.FullPath)) + if (!IdeServices.DesktopService.GetFileIsText (file.FullPath)) continue; lock (alreadyVisited) { if (alreadyVisited.Contains (file.FullPath)) @@ -172,7 +172,7 @@ namespace MonoDevelop.Ide.FindInFiles foreach (ProjectFile file in project.GetSourceFilesAsync (conf).Result.Where (f => filterOptions.NameMatches (f.Name) && File.Exists (f.Name))) { if ((file.Flags & ProjectItemFlags.Hidden) == ProjectItemFlags.Hidden) continue; - if (!DesktopService.GetFileIsText (file.FilePath)) + if (!IdeServices.DesktopService.GetFileIsText (file.FilePath)) continue; lock (alreadyVisited) { @@ -228,7 +228,7 @@ namespace MonoDevelop.Ide.FindInFiles foreach (ProjectFile file in project.GetSourceFilesAsync (conf).Result.Where (f => filterOptions.NameMatches (f.Name) && File.Exists (f.Name))) { if ((file.Flags & ProjectItemFlags.Hidden) == ProjectItemFlags.Hidden) continue; - if (!DesktopService.GetFileIsText (file.Name)) + if (!IdeServices.DesktopService.GetFileIsText (file.Name)) continue; if (alreadyVisited.Contains (file.FilePath.FullPath)) continue; @@ -259,7 +259,7 @@ namespace MonoDevelop.Ide.FindInFiles foreach (Document document in IdeApp.Workbench.Documents) { monitor.Log.WriteLine (GettextCatalog.GetString ("Looking in '{0}'", document.FileName)); if (document.Editor != null && filterOptions.NameMatches (document.FileName)) - yield return new OpenFileProvider (document.Editor, document.Project); + yield return new OpenFileProvider (document.Editor, document.Owner as Project); } } @@ -326,7 +326,7 @@ namespace MonoDevelop.Ide.FindInFiles continue; if (!filterOptions.NameMatches (fileName)) continue; - if (!DesktopService.GetFileIsText (fileName)) + if (!IdeServices.DesktopService.GetFileIsText (fileName)) continue; yield return fileName; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs index 18ad2c64d9..6e7a803edd 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs @@ -1,4 +1,4 @@ -// +// // SearchResult.cs // // Author: @@ -264,7 +264,7 @@ namespace MonoDevelop.Ide.FindInFiles if (cachedEditor == null || cachedEditor.FileName != FileName || cachedEditorFileProvider != FileProvider) { var content = FileProvider.ReadString (); cachedEditor?.Dispose (); - cachedEditor = TextEditorFactory.CreateNewEditor (TextEditorFactory.CreateNewReadonlyDocument (new Core.Text.StringTextSource (content.ReadToEnd ()), FileName, DesktopService.GetMimeTypeForUri (FileName))); + cachedEditor = TextEditorFactory.CreateNewEditor (TextEditorFactory.CreateNewReadonlyDocument (new Core.Text.StringTextSource (content.ReadToEnd ()), FileName, IdeServices.DesktopService.GetMimeTypeForUri (FileName))); cachedEditorFileProvider = FileProvider; } return cachedEditor; 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 3918d0bee2..062551c243 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs @@ -1,4 +1,4 @@ -// +// // SearchResultWidget.cs // // Author: @@ -390,7 +390,7 @@ namespace MonoDevelop.Ide.FindInFiles var searchResult = (SearchResult)model.GetValue (iter, SearchResultColumn); if (searchResult == null) return; - fileNamePixbufRenderer.Image = DesktopService.GetIconForFile (searchResult.FileName, IconSize.Menu); + fileNamePixbufRenderer.Image = IdeServices.DesktopService.GetIconForFile (searchResult.FileName, IconSize.Menu); } static string MarkupText (string text, bool didRead) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs index 1c8861c3d2..577ee48472 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs @@ -1,4 +1,4 @@ -// +// // FontChooserPanelWidget.cs // // Author: @@ -41,7 +41,7 @@ namespace MonoDevelop.Ide.Fonts public void SetFont (string fontName, string fontDescription) { customFonts [fontName] = fontDescription; - FontService.SetFont (fontName, fontDescription); + IdeServices.FontService.SetFont (fontName, fontDescription); } @@ -50,7 +50,7 @@ namespace MonoDevelop.Ide.Fonts if (customFonts.ContainsKey (fontName)) return customFonts [fontName]; - return FontService.GetUnderlyingFontName (fontName); + return IdeServices.FontService.GetUnderlyingFontName (fontName); } public void Store () @@ -63,7 +63,7 @@ namespace MonoDevelop.Ide.Fonts protected override void OnDestroyed () { foreach (var val in selectedFonts) { - FontService.SetFont (val.Key, val.Value); + IdeServices.FontService.SetFont (val.Key, val.Value); } base.OnDestroyed (); } @@ -72,15 +72,15 @@ namespace MonoDevelop.Ide.Fonts { this.Build (); - foreach (var desc in FontService.FontDescriptions) { - selectedFonts [desc.Name] = FontService.GetUnderlyingFontName (desc.Name); + foreach (var desc in IdeServices.FontService.FontDescriptions) { + selectedFonts [desc.Name] = IdeServices.FontService.GetUnderlyingFontName (desc.Name); var fontNameLabel = new Label (desc.DisplayName); fontNameLabel.Justify = Justification.Left; fontNameLabel.Xalign = 0; mainBox.PackStart (fontNameLabel, false, false, 0); var hBox = new HBox (); var setFontButton = new Button (); - setFontButton.Label = FontService.FilterFontName (GetFont (desc.Name)); + setFontButton.Label = IdeServices.FontService.FilterFontName (GetFont (desc.Name)); var descStr = GettextCatalog.GetString ("Set the font options for {0}", desc.DisplayName); setFontButton.Accessible.Description = descStr; @@ -92,14 +92,14 @@ namespace MonoDevelop.Ide.Fonts }; MonoDevelop.Components.IdeTheme.ApplyTheme (selectionDialog); try { - string fontValue = FontService.FilterFontName (GetFont (desc.Name)); + string fontValue = IdeServices.FontService.FilterFontName (GetFont (desc.Name)); selectionDialog.SetFontName (fontValue); if (MessageService.RunCustomDialog (selectionDialog) != (int)Gtk.ResponseType.Ok) { return; } fontValue = selectionDialog.FontName; - if (fontValue == FontService.FilterFontName (FontService.GetFont (desc.Name).FontDescription)) - fontValue = FontService.GetFont (desc.Name).FontDescription; + if (fontValue == IdeServices.FontService.FilterFontName (IdeServices.FontService.GetFont (desc.Name).FontDescription)) + fontValue = IdeServices.FontService.GetFont (desc.Name).FontDescription; SetFont (desc.Name, fontValue); setFontButton.Label = selectionDialog.FontName; } finally { @@ -112,8 +112,8 @@ namespace MonoDevelop.Ide.Fonts var setDefaultFontButton = new Button (); setDefaultFontButton.Label = GettextCatalog.GetString ("Set To Default"); setDefaultFontButton.Clicked += delegate { - SetFont (desc.Name, FontService.GetFont (desc.Name).FontDescription); - setFontButton.Label = FontService.FilterFontName (GetFont (desc.Name)); + SetFont (desc.Name, IdeServices.FontService.GetFont (desc.Name).FontDescription); + setFontButton.Label = IdeServices.FontService.FilterFontName (GetFont (desc.Name)); }; hBox.PackStart (setDefaultFontButton, false, false, 0); mainBox.PackStart (hBox, false, false, 0); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs index df7eab8d2e..6a3917dbef 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs @@ -1,5 +1,5 @@ // -// IdeApp.FontService.cs +// IdeServices.FontService.cs // // Author: // Mike Krüger <mkrueger@novell.com> @@ -204,17 +204,17 @@ namespace MonoDevelop.Ide.Fonts public FontConfigurationProperty (string name) { this.name = name; - IdeApp.FontService.RegisterFontChangedCallback (name, OnChanged); + IdeServices.FontService.RegisterFontChangedCallback (name, OnChanged); } protected override FontDescription OnGetValue () { - return IdeApp.FontService.GetFontDescription (name); + return IdeServices.FontService.GetFontDescription (name); } protected override bool OnSetValue (FontDescription value) { - IdeApp.FontService.SetFont (name, value.ToString ()); + IdeServices.FontService.SetFont (name, value.ToString ()); return true; } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs index 6530e6d552..df373fa756 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs @@ -1,4 +1,4 @@ -// +// // LogView.cs // // Author: @@ -513,7 +513,7 @@ namespace MonoDevelop.Ide.Gui.Components void UpdateCustomFont () { - textEditorControl.ModifyFont (IdeApp.Preferences.CustomOutputPadFont ?? FontService.MonospaceFont); + textEditorControl.ModifyFont (IdeApp.Preferences.CustomOutputPadFont ?? IdeServices.FontService.MonospaceFont); } //mechanism to to batch copy text when large amounts are being dumped diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs index 0c42fa9d38..5ee9bdf9e6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs @@ -1,4 +1,4 @@ -// +// // FileSelectorDialog.cs // // Author: @@ -213,7 +213,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs int selected = -1; int i = 0; - if (IdeApp.Services.ProjectService.IsWorkspaceItemFile (Filename) || IdeApp.Services.ProjectService.IsSolutionItemFile (Filename)) { + if (IdeServices.ProjectService.IsWorkspaceItemFile (Filename) || IdeServices.ProjectService.IsSolutionItemFile (Filename)) { viewerSelector.AppendText (GettextCatalog.GetString ("Solution Workbench")); currentViewers.Add (null); @@ -227,7 +227,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs i++; } - foreach (FileViewer vw in DisplayBindingService.GetFileViewers (Filename, null)) { + foreach (FileViewer vw in IdeServices.DisplayBindingService.GetFileViewers (Filename, null).Result) { if (!vw.IsExternal) { viewerSelector.AppendText (vw.Title); currentViewers.Add (vw); @@ -260,7 +260,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs return; } - if (IdeApp.Services.ProjectService.IsWorkspaceItemFile (Filename) || IdeApp.Services.ProjectService.IsSolutionItemFile (Filename)) { + if (IdeServices.ProjectService.IsWorkspaceItemFile (Filename) || IdeServices.ProjectService.IsSolutionItemFile (Filename)) { encodingLabel.Sensitive = encodingMenu.Sensitive = (SelectedViewer != null); closeWorkspaceCheck.Visible = viewerLabel.Visible && IdeApp.Workspace.IsOpen; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsPanel.cs index ea9ff3170e..ba4eddd2d5 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsPanel.cs @@ -1,4 +1,4 @@ -// +// // MimeTypePolicyOptionsPanel.cs // // Author: @@ -81,7 +81,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs this.policyContainer = policyContainer; this.defaultPolicyContainer = defaultPolicyContainer; this.isExactMimeType = isExactMimeType; - mimeTypeScopes = DesktopService.GetMimeTypeInheritanceChain (mimeType); + mimeTypeScopes = IdeServices.DesktopService.GetMimeTypeInheritanceChain (mimeType); } void IMimeTypePolicyOptionsPanel.SetParentSection (MimeTypePolicyOptionsSection section) @@ -265,7 +265,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs box.Spacing = 6; string baseType = mimeTypeScopes.ElementAt (1); - baseType = DesktopService.GetMimeTypeDescription (baseType); + baseType = IdeServices.DesktopService.GetMimeTypeDescription (baseType); defaultSettingsButton = new CheckButton (GettextCatalog.GetString ("Use default settings from '{0}'", baseType)); defaultSettingsButton.Clicked += delegate { if (defaultSettingsButton.Active) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsSection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsSection.cs index 256bc85076..99edf1550b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsSection.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsSection.cs @@ -1,4 +1,4 @@ -// +// // IMimeTypePolicyOptionsPanel.cs // // Author: @@ -134,7 +134,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs // Get the panels for all mime types List<string> types = new List<string> (); - types.AddRange (DesktopService.GetMimeTypeInheritanceChain (mimeType)); + types.AddRange (IdeServices.DesktopService.GetMimeTypeInheritanceChain (mimeType)); panelData.SectionLoaded = true; panels = panelData.Panels; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs index cea4114b08..87cc1d377e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs @@ -1,4 +1,4 @@ -// OptionsDialog.cs +// OptionsDialog.cs // // Author: // Lluis Sanchez Gual <lluis@novell.com> @@ -243,7 +243,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs // Instead, give this some awareness of the mime system. var mimeSection = section as MonoDevelop.Ide.Projects.OptionPanels.MimetypeOptionsDialogSection; if (mimeSection != null && !string.IsNullOrEmpty (mimeSection.MimeType)) { - var pix = DesktopService.GetIconForType (mimeSection.MimeType, treeIconSize); + var pix = IdeServices.DesktopService.GetIconForType (mimeSection.MimeType, treeIconSize); if (pix != null) { crp.Image = pix; } else { @@ -598,7 +598,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs ((Notebook)c).Page = 0; } - if (!DesktopService.AccessibilityInUse && !DesktopService.AccessibilityKeyboardFocusInUse) { + if (!IdeServices.DesktopService.AccessibilityInUse && !IdeServices.DesktopService.AccessibilityKeyboardFocusInUse) { // Don't automatically expand trees if using accessibility // as it can be confusing with screen readers tree.ExpandToPath (store.GetPath (page.Iter)); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs index 066e8b5a9a..ceacbd1780 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs @@ -1,4 +1,4 @@ -// +// // ProjectNodeBuilder.cs // // Author: @@ -46,12 +46,12 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad { protected override void Initialize () { - // TypeSystemService.TypesUpdated += OnClassInformationChanged; + // IdeApp.TypeSystemService.TypesUpdated += OnClassInformationChanged; } public override void Dispose () { - // TypeSystemService.TypesUpdated -= OnClassInformationChanged; + // IdeApp.TypeSystemService.TypesUpdated -= OnClassInformationChanged; } public override Type NodeDataType { @@ -98,7 +98,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad builder.AddChild (((DotNetProject)project).References); } bool publicOnly = builder.Options ["PublicApiOnly"]; - var dom = TypeSystemService.GetCompilationAsync (project).Result; + var dom = IdeApp.TypeSystemService.GetCompilationAsync (project).Result; if (dom == null) return; bool nestedNamespaces = builder.Options ["NestedNamespaces"]; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/SolutionNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/SolutionNodeBuilder.cs index c06160f4a7..eebb895b35 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/SolutionNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/SolutionNodeBuilder.cs @@ -1,4 +1,4 @@ -// SolutionNodeBuilder.cs +// SolutionNodeBuilder.cs // // Author: // Lluis Sanchez Gual <lluis@novell.com> @@ -283,7 +283,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad public void OnOpenFolder () { Solution solution = (Solution) CurrentNode.DataItem; - DesktopService.OpenFolder (solution.BaseDirectory, solution.FileName); + IdeServices.DesktopService.OpenFolder (solution.BaseDirectory, solution.FileName); } [CommandHandler (SearchCommands.FindInFiles)] diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FileOperationsBuilderExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FileOperationsBuilderExtension.cs index ff4d0ae5b8..4cc0fecd15 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FileOperationsBuilderExtension.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FileOperationsBuilderExtension.cs @@ -1,4 +1,4 @@ -// +// // FileOperationsBuilderExtension.cs // // Author: @@ -93,7 +93,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad } } foreach (var folder in paths) { - DesktopService.OpenFolder (folder.Key, folder.Value.Select ((f) => (FilePath)f).ToArray ()); + IdeServices.DesktopService.OpenFolder (folder.Key, folder.Value.Select ((f) => (FilePath)f).ToArray ()); } } @@ -110,7 +110,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad [AllowMultiSelection] public void OnUpdateOpenInTerminal (CommandInfo info) { - info.Visible = DesktopService.CanOpenTerminal && GetCurrentDirectories ().Any (); + info.Visible = IdeServices.DesktopService.CanOpenTerminal && GetCurrentDirectories ().Any (); } [CommandHandler (FileCommands.OpenInTerminal)] @@ -118,7 +118,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad public void OnOpenInTerminal () { foreach (var dir in GetCurrentDirectories ()) - DesktopService.OpenTerminal (dir); + IdeServices.DesktopService.OpenTerminal (dir); } IEnumerable<String> GetCurrentDirectories () 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 d0cfd96d0a..a28bbc385f 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 @@ -1,4 +1,4 @@ -// +// // SolutionFolderFileNodeBuilder.cs // // Author: @@ -64,7 +64,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad nodeInfo.Label = file.Name; if (!System.IO.File.Exists (file.Path)) nodeInfo.Label = "<span foreground='" + Styles.ErrorForegroundColor.ToHexString (false) + "'>" + nodeInfo.Label + "</span>"; - nodeInfo.Icon = DesktopService.GetIconForFile (file.Path, Gtk.IconSize.Menu); + nodeInfo.Icon = IdeServices.DesktopService.GetIconForFile (file.Path, Gtk.IconSize.Menu); } public override object GetParentObject (object dataObject) 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 e64ebc07ba..38e717bca1 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 @@ -1,4 +1,4 @@ -// +// // SystemFileNodeBuilder.cs // // Author: @@ -68,7 +68,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad SystemFile file = (SystemFile) dataObject; nodeInfo.Label = GLib.Markup.EscapeText (file.Name); - nodeInfo.Icon = DesktopService.GetIconForFile (file.Path, Gtk.IconSize.Menu); + nodeInfo.Icon = IdeServices.DesktopService.GetIconForFile (file.Path, Gtk.IconSize.Menu); if (file.ShowTransparent) { var gicon = Context.GetComposedIcon (nodeInfo.Icon, "fade"); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs index 55a6863e39..c826300f8a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs @@ -1,4 +1,4 @@ -// ErrorListPad.cs +// ErrorListPad.cs // // Author: // Todd Berman <tberman@sevenl.net> @@ -298,10 +298,10 @@ namespace MonoDevelop.Ide.Gui.Pads sw = new MonoDevelop.Components.CompactScrolledWindow (); sw.ShadowType = ShadowType.None; sw.Add (view); - TaskService.Errors.TasksRemoved += ShowResults; - TaskService.Errors.TasksAdded += TaskAdded; - TaskService.Errors.TasksChanged += TaskChanged; - TaskService.Errors.CurrentLocationTaskChanged += HandleTaskServiceErrorsCurrentLocationTaskChanged; + IdeServices.TaskService.Errors.TasksRemoved += ShowResults; + IdeServices.TaskService.Errors.TasksAdded += TaskAdded; + IdeServices.TaskService.Errors.TasksChanged += TaskChanged; + IdeServices.TaskService.Errors.CurrentLocationTaskChanged += HandleTaskServiceErrorsCurrentLocationTaskChanged; IdeApp.Workspace.FirstWorkspaceItemOpened += OnCombineOpen; IdeApp.Workspace.LastWorkspaceItemClosed += OnCombineClosed; @@ -327,7 +327,7 @@ namespace MonoDevelop.Ide.Gui.Pads logBtn.Active = OutputViewVisible; // Load existing tasks - foreach (TaskListEntry t in TaskService.Errors) { + foreach (TaskListEntry t in IdeServices.TaskService.Errors) { AddTask (t); } } @@ -347,10 +347,10 @@ namespace MonoDevelop.Ide.Gui.Pads IdeApp.ProjectOperations.StartBuild -= OnBuildStarted; IdeApp.ProjectOperations.StartClean -= OnBuildStarted; - TaskService.Errors.TasksRemoved -= ShowResults; - TaskService.Errors.TasksAdded -= TaskAdded; - TaskService.Errors.TasksChanged -= TaskChanged; - TaskService.Errors.CurrentLocationTaskChanged -= HandleTaskServiceErrorsCurrentLocationTaskChanged; + IdeServices.TaskService.Errors.TasksRemoved -= ShowResults; + IdeServices.TaskService.Errors.TasksAdded -= TaskAdded; + IdeServices.TaskService.Errors.TasksChanged -= TaskChanged; + IdeServices.TaskService.Errors.CurrentLocationTaskChanged -= HandleTaskServiceErrorsCurrentLocationTaskChanged; buildOutput?.Dispose (); buildOutputViewContent?.Dispose (); @@ -404,7 +404,7 @@ namespace MonoDevelop.Ide.Gui.Pads void HandleTaskServiceErrorsCurrentLocationTaskChanged (object sender, EventArgs e) { - if (TaskService.Errors.CurrentLocationTask == null) { + if (IdeServices.TaskService.Errors.CurrentLocationTask == null) { view.Selection.UnselectAll (); return; } @@ -413,7 +413,7 @@ namespace MonoDevelop.Ide.Gui.Pads return; do { TaskListEntry t = (TaskListEntry)view.Model.GetValue (it, DataColumns.Task); - if (t == TaskService.Errors.CurrentLocationTask) { + if (t == IdeServices.TaskService.Errors.CurrentLocationTask) { view.Selection.SelectIter (it); view.ScrollToCell (view.Model.GetPath (it), view.Columns [0], false, 0, 0); it = filter.ConvertIterToChildIter (sort.ConvertIterToChildIter (it)); @@ -518,7 +518,7 @@ namespace MonoDevelop.Ide.Gui.Pads TaskListEntry task = store.GetValue (iter, DataColumns.Task) as TaskListEntry; if (task != null) { - OpenBuildOutputViewDocument (); + await OpenBuildOutputViewDocument (); if (task.Severity == TaskSeverity.Error) { await buildOutputViewContent.GoToError (task.Message, task.GetProjectWithExtension ()); } else if (task.Severity == TaskSeverity.Warning) { @@ -605,7 +605,7 @@ namespace MonoDevelop.Ide.Gui.Pads { string reference = null; if (GetSelectedErrorReference (out reference) && reference != null) - DesktopService.ShowUrl (reference); + IdeServices.DesktopService.ShowUrl (reference); } bool GetSelectedErrorReference (out string reference) @@ -640,10 +640,10 @@ namespace MonoDevelop.Ide.Gui.Pads store.SetValue (iter, DataColumns.Read, true); TaskListEntry task = store.GetValue (iter, DataColumns.Task) as TaskListEntry; if (task != null) { - TaskService.ShowStatus (task); + IdeServices.TaskService.ShowStatus (task); task.JumpToPosition (); - TaskService.Errors.CurrentLocationTask = task; - IdeApp.Workbench.ActiveLocationList = TaskService.Errors; + IdeServices.TaskService.Errors.CurrentLocationTask = task; + IdeApp.Workbench.ActiveLocationList = IdeServices.TaskService.Errors; } } } @@ -865,7 +865,7 @@ namespace MonoDevelop.Ide.Gui.Pads { Clear(); - AddTasks (TaskService.Errors); + AddTasks (IdeServices.TaskService.Errors); } private void Clear() @@ -983,7 +983,7 @@ namespace MonoDevelop.Ide.Gui.Pads if (view.Model.GetIterFromString (out iter, args.Path)) { TaskListEntry task = (TaskListEntry)view.Model.GetValue (iter, DataColumns.Task); task.Completed = !task.Completed; - TaskService.FireTaskToggleEvent (this, new TaskEventArgs (task)); + IdeServices.TaskService.FireTaskToggleEvent (this, new TaskEventArgs (task)); } } @@ -1057,15 +1057,15 @@ namespace MonoDevelop.Ide.Gui.Pads void HandleBinLogClicked (object sender, EventArgs e) { if (BuildOutput.IsFeatureEnabled) { - OpenBuildOutputViewDocument (); + OpenBuildOutputViewDocument ().Ignore (); } } - void OpenBuildOutputViewDocument () + async Task OpenBuildOutputViewDocument () { if (buildOutputViewContent == null) { buildOutputViewContent = new BuildOutputViewContent (buildOutput); - buildOutputDoc = IdeApp.Workbench.OpenDocument (buildOutputViewContent, true); + buildOutputDoc = await IdeApp.Workbench.OpenDocument (buildOutputViewContent, true); buildOutputDoc.Closed += BuildOutputDocClosed; } else if (buildOutputDoc != null) { buildOutputDoc.Select (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ConfigurationComboBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ConfigurationComboBox.cs index 22a61119ec..c71b5c842d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ConfigurationComboBox.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ConfigurationComboBox.cs @@ -1,4 +1,4 @@ -// +// // ConfigurationComboBox.cs // // Author: @@ -83,7 +83,7 @@ namespace MonoDevelop.Ide.Gui fd = null; } if (toolbar.IconSize == Gtk.IconSize.Menu || toolbar.IconSize == Gtk.IconSize.SmallToolbar) { - fd = FontService.SansFont.CopyModified (Styles.FontScale11); + fd = IdeServices.FontService.SansFont.CopyModified (Styles.FontScale11); } combo.ModifyLabelFont (fd); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupAssetType.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupAssetType.cs index 90f9ccf4b5..5fd8b9a843 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupAssetType.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupAssetType.cs @@ -24,6 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System.Web.UI; +using MonoDevelop.Ide.Extensions; namespace MonoDevelop.Ide.Gui { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StatusProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StatusProgressMonitor.cs index d7a1a90520..6778502c2d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StatusProgressMonitor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StatusProgressMonitor.cs @@ -1,4 +1,4 @@ -// +// // StatusProgressMonitor.cs // // Author: @@ -70,9 +70,9 @@ namespace MonoDevelop.Ide.Gui statusBar.ShowMessage (icon, CurrentTaskName); if (!ProgressIsUnknown) { statusBar.SetProgressFraction (Progress); - DesktopService.SetGlobalProgress (Progress); + IdeServices.DesktopService.SetGlobalProgress (Progress); } else - DesktopService.ShowGlobalProgressIndeterminate (); + IdeServices.DesktopService.ShowGlobalProgressIndeterminate (); } public void UpdateStatusBar () @@ -102,7 +102,7 @@ namespace MonoDevelop.Ide.Gui statusBar.ShowWarning (Warnings [Warnings.Length - 1]); } - DesktopService.ShowGlobalProgressError (); + IdeServices.DesktopService.ShowGlobalProgressError (); base.OnCompleted (); @@ -119,7 +119,7 @@ namespace MonoDevelop.Ide.Gui statusBar.Dispose (); } - DesktopService.SetGlobalProgress (Progress); + IdeServices.DesktopService.SetGlobalProgress (Progress); base.OnCompleted (); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ToolbarComboBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ToolbarComboBox.cs index 065e41692e..8334e3d556 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ToolbarComboBox.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ToolbarComboBox.cs @@ -1,4 +1,4 @@ -// +// // ConfigurationComboBox.cs // // Author: @@ -66,7 +66,7 @@ namespace MonoDevelop.Ide.Gui { if (Style != null) { if (toolbar.IconSize == Gtk.IconSize.Menu || toolbar.IconSize == Gtk.IconSize.SmallToolbar) { - ctx.FontDesc = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); + ctx.FontDesc = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); } else { ctx.FontDesc = Style.FontDescription; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryItem.cs index 72665babf7..89f3861248 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryItem.cs @@ -1,4 +1,4 @@ -// +// // NavigationHistoryService.cs // // Author: @@ -56,8 +56,8 @@ namespace MonoDevelop.Ide.Navigation public void Show () { if (NavigationPoint is DocumentNavigationPoint) { - if (!NavigationHistoryService.IsCurrent (this)) - NavigationHistoryService.MoveTo (this); + if (!IdeServices.NavigationHistoryService.IsCurrent (this)) + IdeServices.NavigationHistoryService.MoveTo (this); } NavigationPoint.ShowDocument (); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs index 6c8eb48f7a..fcbebb3c1d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs @@ -1,4 +1,4 @@ -// +// // CodeFormattingPanelWidget.cs // // Author: @@ -113,7 +113,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels MimeTypePanelData AddPanel (string mt) { - var chain = new List<string> (DesktopService.GetMimeTypeInheritanceChain (mt).Where (mimeTypesWithPolicies.Contains)); + var chain = new List<string> (IdeServices.DesktopService.GetMimeTypeInheritanceChain (mt).Where (mimeTypesWithPolicies.Contains)); if (chain.Count == 0) return null; MimeTypePanelData data = new MimeTypePanelData (); @@ -121,7 +121,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels sec.Fill = true; data.Section = sec; data.MimeType = mt; - data.TypeDescription = DesktopService.GetMimeTypeDescription (mt); + data.TypeDescription = IdeServices.DesktopService.GetMimeTypeDescription (mt); if (string.IsNullOrEmpty (data.TypeDescription)) data.TypeDescription = mt; data.DataObject = DataObject; @@ -244,8 +244,8 @@ namespace MonoDevelop.Ide.Projects.OptionPanels } else if (item is Project) { foreach (ProjectFile pf in ((Project)item).Files) { - string mt = DesktopService.GetMimeTypeForUri (pf.FilePath); - foreach (string mth in DesktopService.GetMimeTypeInheritanceChain (mt)) + string mt = IdeServices.DesktopService.GetMimeTypeForUri (pf.FilePath); + foreach (string mth in IdeServices.DesktopService.GetMimeTypeInheritanceChain (mt)) types.Add (mth); } } @@ -398,7 +398,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels void Fill () { foreach (MimeTypePanelData mt in panel.GetMimeTypeData ()) { - store.AppendValues (mt, DesktopService.GetIconForType (mt.MimeType, Gtk.IconSize.Menu), mt.TypeDescription); + store.AppendValues (mt, IdeServices.DesktopService.GetIconForType (mt.MimeType, Gtk.IconSize.Menu), mt.TypeDescription); } } @@ -422,7 +422,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels try { if (MessageService.RunCustomDialog (dlg, this.Toplevel as Gtk.Window) == (int) Gtk.ResponseType.Ok) { MimeTypePanelData mt = panel.AddGlobalMimeType (dlg.MimeType); - store.AppendValues (mt, DesktopService.GetIconForType (mt.MimeType, Gtk.IconSize.Menu), mt.TypeDescription); + store.AppendValues (mt, IdeServices.DesktopService.GetIconForType (mt.MimeType, Gtk.IconSize.Menu), mt.TypeDescription); } } finally { dlg.Destroy (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs index ba7eb41939..766dc5c28d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs @@ -1,4 +1,4 @@ -// +// // PortableRuntimeOptionsPanel.cs // // Author: Jeffrey Stedfast <jeff@xamarin.com> @@ -227,7 +227,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels void HandleLink (string url) { - DesktopService.ShowUrl (url); + IdeServices.DesktopService.ShowUrl (url); } void PickFramework (object sender, EventArgs e) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddMimeTypeDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddMimeTypeDialog.cs index a3510252fe..13f4a41ad2 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddMimeTypeDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddMimeTypeDialog.cs @@ -1,4 +1,4 @@ -// +// // AddMimeTypeDialog.cs // // Author: @@ -62,13 +62,13 @@ namespace MonoDevelop.Ide.Projects string mt = TryGetFileType (name); if (mt != null && mt != "text/plain") { - desc = DesktopService.GetMimeTypeDescription (mt); - img = DesktopService.GetIconForType (mt, Gtk.IconSize.Menu); + desc = IdeServices.DesktopService.GetMimeTypeDescription (mt); + img = IdeServices.DesktopService.GetIconForType (mt, Gtk.IconSize.Menu); mimeType = mt; } else if (name.IndexOf ('/') != -1) { - desc = DesktopService.GetMimeTypeDescription (name); - img = DesktopService.GetIconForType (name, Gtk.IconSize.Menu); + desc = IdeServices.DesktopService.GetMimeTypeDescription (name); + img = IdeServices.DesktopService.GetIconForType (name, Gtk.IconSize.Menu); mimeType = name; } else { img = ImageService.GetIcon (Gtk.Stock.DialogError, Gtk.IconSize.Menu); @@ -98,7 +98,7 @@ namespace MonoDevelop.Ide.Projects string f = System.IO.Path.ChangeExtension (tmpFile, "." + name); File.Move (tmpFile, f); tmpFile = f; - return DesktopService.GetMimeTypeForUri (tmpFile); + return IdeServices.DesktopService.GetMimeTypeForUri (tmpFile); } catch { return null; } finally { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ConfirmProjectDeleteDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ConfirmProjectDeleteDialog.cs index b9944dc13e..06c0788dba 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ConfirmProjectDeleteDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ConfirmProjectDeleteDialog.cs @@ -1,4 +1,4 @@ -// +// // ConfirmProjectDeleteDialog.cs // // Author: @@ -103,7 +103,7 @@ namespace MonoDevelop.Ide.Projects // from the item directory are shown in the list foreach (FilePath f in item.GetItemFiles (false)) { if (!f.IsChildPathOf (item.BaseDirectory)) { - var pix = DesktopService.GetIconForFile (f, IconSize.Menu); + var pix = IdeServices.DesktopService.GetIconForFile (f, IconSize.Menu); paths [f] = store.AppendValues (true, pix, f.FileName, f.ToString ()); } } @@ -179,17 +179,17 @@ namespace MonoDevelop.Ide.Projects TreeIter dit; if (!iter.Equals (TreeIter.Zero)) { - dit = store.AppendValues (iter, false, DesktopService.GetIconForFile (dir, IconSize.Menu), dir.FileName.ToString (), dir.ToString ()); + dit = store.AppendValues (iter, false, IdeServices.DesktopService.GetIconForFile (dir, IconSize.Menu), dir.FileName.ToString (), dir.ToString ()); fileList.ExpandRow (store.GetPath (iter), false); } else - dit = store.AppendValues (false, DesktopService.GetIconForFile (dir, IconSize.Menu), dir.FileName.ToString (), dir.ToString ()); + dit = store.AppendValues (false, IdeServices.DesktopService.GetIconForFile (dir, IconSize.Menu), dir.FileName.ToString (), dir.ToString ()); paths [dir] = dit; foreach (string file in Directory.GetFiles (dir)) { string path = System.IO.Path.GetFileName (file); - var pix = DesktopService.GetIconForFile (file, IconSize.Menu); + var pix = IdeServices.DesktopService.GetIconForFile (file, IconSize.Menu); bool active = itemFiles.Contains (file); string color = null; if (!active) { @@ -220,7 +220,7 @@ namespace MonoDevelop.Ide.Projects if ((cinfo & ChildInfo.AllSelected) != 0 && hasChildren) store.SetValue (dit, 0, true); if ((cinfo & ChildInfo.HasProjectFiles) == 0) { - var pix = DesktopService.GetIconForFile (dir, IconSize.Menu).WithAlpha (0.5); + var pix = IdeServices.DesktopService.GetIconForFile (dir, IconSize.Menu).WithAlpha (0.5); store.SetValue (dit, 1, pix); store.SetValue (dit, 4, "dimgrey"); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IncludeNewFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IncludeNewFilesDialog.cs index 09c4833ab9..8466794587 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IncludeNewFilesDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IncludeNewFilesDialog.cs @@ -1,4 +1,4 @@ -// +// // IncludeNewFilesDialog.cs // // Author: @@ -207,7 +207,7 @@ namespace MonoDevelop.Ide.Projects TreeIter iter = GetPath (relativePath.ParentDirectory); object[] values = new object[] { //FIXME: look these pixbufs up lazily in the renderer - DesktopService.GetIconForFile (filePath, IconSize.Menu), + IdeServices.DesktopService.GetIconForFile (filePath, IconSize.Menu), null, filePath.FileName, filePath.ToString (), diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs index 27c99ec8cd..1b1774908d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs @@ -1,4 +1,4 @@ -// NewFileDialog.cs +// NewFileDialog.cs // // Author: // Todd Berman <tberman@off.net> @@ -175,7 +175,7 @@ namespace MonoDevelop.Ide.Projects if (catView.Selection.GetSelected (out treeModel, out treeIter)) { FillCategoryTemplates (treeIter); - if (!DesktopService.AccessibilityInUse) { + if (!IdeServices.DesktopService.AccessibilityInUse) { // When accessibility is being used, don't expand rows automatically // as it can be confusing when using a screen reader catView.ExpandRow (treeModel.GetPath (treeIter), false); 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 b7b621049d..7db79a9d38 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs @@ -338,7 +338,7 @@ namespace MonoDevelop.Ide.Projects if (templatingService != null)
return templatingService;
- return IdeApp.Services.TemplatingService;
+ return IdeServices.TemplatingService;
}
set { templatingService = value; }
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectFileSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectFileSelectorDialog.cs index 90cb6deab4..0a394c3ba8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectFileSelectorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectFileSelectorDialog.cs @@ -1,4 +1,4 @@ -// +// // ProjectFileSelectorDialog.cs // // Author: @@ -277,7 +277,7 @@ namespace MonoDevelop.Ide.Projects continue; if (regex.IsMatch (pf.FilePath.FileName)) - fileStore.AppendValues (pf, DesktopService.GetIconForFile (pf.FilePath, Gtk.IconSize.Menu)); + fileStore.AppendValues (pf, IdeServices.DesktopService.GetIconForFile (pf.FilePath, Gtk.IconSize.Menu)); } TreeIter root; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.RoslynServices.Options/OptionsExtensions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.RoslynServices.Options/OptionsExtensions.cs index 660d93e092..c78a29e00f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.RoslynServices.Options/OptionsExtensions.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.RoslynServices.Options/OptionsExtensions.cs @@ -52,7 +52,7 @@ namespace MonoDevelop.Ide.RoslynServices.Options public static TextStylePolicy GetTextStylePolicy (this OptionKey optionKey) { - var mimeChain = DesktopService.GetMimeTypeInheritanceChainForRoslynLanguage (optionKey.Language); + var mimeChain = IdeServices.DesktopService.GetMimeTypeInheritanceChainForRoslynLanguage (optionKey.Language); if (mimeChain == null) { throw new Exception ($"Unknown Roslyn language {optionKey.Language}"); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.RoslynServices/MonoDevelopErrorReportingService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.RoslynServices/MonoDevelopErrorReportingService.cs index 6411a15aa4..27887e2426 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.RoslynServices/MonoDevelopErrorReportingService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.RoslynServices/MonoDevelopErrorReportingService.cs @@ -65,7 +65,7 @@ namespace MonoDevelop.Ide.RoslynServices // If the output is redirected, open the log file, otherwise do not do anything. if (logFile != null) - DesktopService.OpenFile (logFile); + IdeServices.DesktopService.OpenFile (logFile); } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/ProjectCommentTags.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/ProjectCommentTags.cs index e56b8c3600..a7bc10d5f5 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/ProjectCommentTags.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/ProjectCommentTags.cs @@ -1,4 +1,4 @@ -// +// // ProjectCommentTags.cs // // Author: @@ -55,7 +55,7 @@ namespace MonoDevelop.Ide.Tasks if (list == null && oldList == null) return; tags[fileName] = list; - TaskService.InformCommentTasks (new CommentTasksChangedEventArgs (fileName, tagComments, project)); + IdeServices.TaskService.InformCommentTasks (new CommentTasksChangedEventArgs (fileName, tagComments, project)); } } @@ -67,7 +67,7 @@ namespace MonoDevelop.Ide.Tasks tags[fileName] = null; } - TaskService.InformCommentTasks (new CommentTasksChangedEventArgs (fileName, null, project)); + IdeServices.TaskService.InformCommentTasks (new CommentTasksChangedEventArgs (fileName, null, project)); } internal async Task UpdateAsync (Project project, ProjectFile[] files, CancellationToken token = default (CancellationToken)) @@ -77,7 +77,7 @@ namespace MonoDevelop.Ide.Tasks foreach (var file in files) { if (file.BuildAction == BuildAction.None) continue; - var pd = await TypeSystemService.ParseFile (project, file.FilePath, token).ConfigureAwait (false); + var pd = await IdeApp.TypeSystemService.ParseFile (project, file.FilePath, token).ConfigureAwait (false); if (pd != null) { var commentTagList = await pd.GetTagCommentsAsync (token).ConfigureAwait (false); changes.Add (new CommentTaskChange (file.FilePath, commentTagList, project)); @@ -86,7 +86,7 @@ namespace MonoDevelop.Ide.Tasks } await Runtime.RunInMainThread (delegate { this.tags = newTags; - TaskService.InformCommentTasks (new CommentTasksChangedEventArgs (changes)); + IdeServices.TaskService.InformCommentTasks (new CommentTasksChangedEventArgs (changes)); }).ConfigureAwait (false); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskListEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskListEntry.cs index 7011b56aa8..a78d9a4713 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskListEntry.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskListEntry.cs @@ -1,4 +1,4 @@ -// +// // TaskListEntry.cs // // Author: @@ -267,7 +267,7 @@ namespace MonoDevelop.Ide.Tasks void ShowDocumentation () { if (HasDocumentationLink ()) - DesktopService.ShowUrl (DocumentationLink); + IdeServices.DesktopService.ShowUrl (DocumentationLink); } public virtual void JumpToPosition () @@ -292,7 +292,7 @@ namespace MonoDevelop.Ide.Tasks } ShowDocumentation (); } - TaskService.InformJumpToTask (this); + IdeServices.TaskService.InformJumpToTask (this); } public void SelectInPad() diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs index 5ec1c1d7a3..10cc5cacc7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs @@ -469,7 +469,7 @@ namespace MonoDevelop.Ide.Tasks return false; //only files for which we have a default internal display binding - var binding = IdeApp.Services.DisplayBindingService.GetDefaultBinding (t.FileName, mimeType, p); + var binding = IdeServices.DisplayBindingService.GetDefaultBinding (t.FileName, mimeType, p); if (binding == null || !binding.CanUseAsDefault || binding is IExternalDisplayBinding) return false; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs index 2aaed15542..05da57ee33 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs @@ -1,4 +1,4 @@ -// +// // UserTasksView.cs // // Author: @@ -143,9 +143,9 @@ namespace MonoDevelop.Ide.Tasks delButton.Clicked += new EventHandler (DeleteUserTaskClicked); delButton.TooltipText = GettextCatalog.GetString ("Delete Task"); - TaskService.UserTasks.TasksChanged += UserTasksChanged; - TaskService.UserTasks.TasksAdded += UserTasksChanged; - TaskService.UserTasks.TasksRemoved += UserTasksChanged; + IdeServices.TaskService.UserTasks.TasksChanged += UserTasksChanged; + IdeServices.TaskService.UserTasks.TasksAdded += UserTasksChanged; + IdeServices.TaskService.UserTasks.TasksRemoved += UserTasksChanged; if (IdeApp.Workspace.IsOpen) solutionLoaded = true; @@ -183,7 +183,7 @@ namespace MonoDevelop.Ide.Tasks view.ScrollToPoint (0, 0); store.Clear (); - foreach (TaskListEntry task in TaskService.UserTasks) { + foreach (TaskListEntry task in IdeServices.TaskService.UserTasks) { var text = priorities [GetEnumIndex (task.Priority)]; store.AppendValues (text, task.Completed, task.Description, task, GetColorByPriority (task.Priority), task.Completed ? (int)Pango.Weight.Light : (int)Pango.Weight.Bold); } @@ -223,7 +223,7 @@ namespace MonoDevelop.Ide.Tasks TaskListEntry task = new TaskListEntry (); task.WorkspaceObject = IdeApp.ProjectOperations.CurrentSelectedWorkspaceItem; updating = true; - TaskService.UserTasks.Add (task); + IdeServices.TaskService.UserTasks.Add (task); updating = false; var text = priorities [GetEnumIndex (task.Priority)]; TreeIter iter = store.AppendValues (text, task.Completed, task.Description, task, GetColorByPriority (task.Priority), task.Completed ? (int)Pango.Weight.Light : (int)Pango.Weight.Bold); @@ -231,7 +231,7 @@ namespace MonoDevelop.Ide.Tasks TreePath sortedPath = sortModel.ConvertChildPathToPath (store.GetPath (iter)); view.ScrollToCell (sortedPath, view.Columns[(int)Columns.Description], true, 0, 0); view.SetCursorOnCell (sortedPath, view.Columns[(int)Columns.Description], cellRendDesc, true); - TaskService.SaveUserTasks (task.WorkspaceObject); + IdeServices.TaskService.SaveUserTasks (task.WorkspaceObject); } void CopyUserTaskClicked (object o, EventArgs args) @@ -263,10 +263,10 @@ namespace MonoDevelop.Ide.Tasks { TaskListEntry task = (TaskListEntry) store.GetValue (iter, (int)Columns.UserTask); updating = true; - TaskService.UserTasks.Remove (task); + IdeServices.TaskService.UserTasks.Remove (task); updating = false; store.Remove (ref iter); - TaskService.SaveUserTasks (task.WorkspaceObject); + IdeServices.TaskService.SaveUserTasks (task.WorkspaceObject); } } } @@ -290,7 +290,7 @@ namespace MonoDevelop.Ide.Tasks } store.SetValue (iter, (int)Columns.Priority, priorities [args.Active]); store.SetValue (iter, (int)Columns.Foreground, GetColorByPriority (task.Priority)); - TaskService.SaveUserTasks (task.WorkspaceObject); + IdeServices.TaskService.SaveUserTasks (task.WorkspaceObject); } } @@ -305,7 +305,7 @@ namespace MonoDevelop.Ide.Tasks task.Completed = !val; store.SetValue (iter, (int)Columns.Completed, !val); store.SetValue (iter, (int)Columns.Bold, task.Completed ? (int)Pango.Weight.Light : (int)Pango.Weight.Bold); - TaskService.SaveUserTasks (task.WorkspaceObject); + IdeServices.TaskService.SaveUserTasks (task.WorkspaceObject); } } @@ -318,7 +318,7 @@ namespace MonoDevelop.Ide.Tasks TaskListEntry task = (TaskListEntry) sortModel.GetValue (sortedIter, (int)Columns.UserTask); task.Message = args.NewText; store.SetValue (iter, (int)Columns.Description, args.NewText); - TaskService.SaveUserTasks (task.WorkspaceObject); + IdeServices.TaskService.SaveUserTasks (task.WorkspaceObject); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngine.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngine.cs index 313a89ca58..b4be32d880 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngine.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/MicrosoftTemplateEngine.cs @@ -1,4 +1,4 @@ -// +// // MicrosoftTemplateEngine.cs // // Author: @@ -220,7 +220,7 @@ namespace MonoDevelop.Ide.Templates public static async Task FormatFile (PolicyContainer policies, FilePath file) { - string mime = DesktopService.GetMimeTypeForUri (file); + string mime = IdeServices.DesktopService.GetMimeTypeForUri (file); if (mime == null) return; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplateImageProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplateImageProvider.cs index 9558d8849b..424e9d172d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplateImageProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplateImageProvider.cs @@ -53,7 +53,7 @@ namespace MonoDevelop.Ide.Templates Image LoadImageFromResource (string imageId)
{
if (IdeApp.IsInitialized)
- return IdeApp.Services.TemplatingService.LoadTemplateImage (imageId);
+ return IdeServices.TemplatingService.LoadTemplateImage (imageId);
// Should only happen when running unit tests.
return null;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplateWizardProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplateWizardProvider.cs index c6a9db43f5..09997053dc 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplateWizardProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplateWizardProvider.cs @@ -152,7 +152,7 @@ namespace MonoDevelop.Ide.Templates protected virtual TemplateWizard GetWizard (string id)
{
- return IdeApp.Services.TemplatingService.GetWizard (id);
+ return IdeServices.TemplatingService.GetWizard (id);
}
void Reset ()
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplatingService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplatingService.cs index 55cd7f98e0..046e19e429 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplatingService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplatingService.cs @@ -244,7 +244,7 @@ namespace MonoDevelop.Ide.Templates public IList<SolutionTemplate> GetTemplates ()
{
- var categories = IdeApp.Services.TemplatingService.GetProjectTemplateCategories ();
+ var categories = IdeServices.TemplatingService.GetProjectTemplateCategories ();
return GetTemplates (categories);
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopTextLoader.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopTextLoader.cs index b07c7922df..258c10ea79 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopTextLoader.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopTextLoader.cs @@ -50,8 +50,8 @@ namespace MonoDevelop.Ide.TypeSystem { cancellationToken.ThrowIfCancellationRequested (); SourceText text; - if (IdeApp.Workbench?.Documents.Any (doc => doc.IsFile && doc.FileName != null && FilePath.PathComparer.Compare (Path.GetFullPath (doc.FileName), fileName) == 0 && doc.Editor != null) == true) { - var document = IdeApp.Workbench?.Documents.FirstOrDefault (doc => doc.IsFile && doc.FileName != null && FilePath.PathComparer.Compare (Path.GetFullPath (doc.FileName), fileName) == 0 && doc.Editor != null); + if (IdeServices.DocumentManager?.Documents.Any (doc => doc.IsFile && doc.FileName != null && FilePath.PathComparer.Compare (Path.GetFullPath (doc.FileName), fileName) == 0 && doc.Editor != null) == true) { + var document = IdeServices.DocumentManager?.Documents.FirstOrDefault (doc => doc.IsFile && doc.FileName != null && FilePath.PathComparer.Compare (Path.GetFullPath (doc.FileName), fileName) == 0 && doc.Editor != null); text = MonoDevelopSourceText.Create (document.Editor); } else { try { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TextPolicyDocumentOptionsProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TextPolicyDocumentOptionsProvider.cs index f50ada9bc0..8651805501 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TextPolicyDocumentOptionsProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TextPolicyDocumentOptionsProvider.cs @@ -49,12 +49,12 @@ namespace MonoDevelop.Ide.TypeSystem { public Task<IDocumentOptions> GetOptionsForDocumentAsync (Document document, CancellationToken cancellationToken) { - var mimeChain = DesktopService.GetMimeTypeInheritanceChainForRoslynLanguage (document.Project.Language); + var mimeChain = IdeServices.DesktopService.GetMimeTypeInheritanceChainForRoslynLanguage (document.Project.Language); if (mimeChain == null) { return Task.FromResult<IDocumentOptions>(null); } - var project = TypeSystemService.GetMonoProject (document.Project); + var project = IdeApp.TypeSystemService.GetMonoProject (document.Project); var policy = project.Policies.Get<TextStylePolicy> (mimeChain); return Task.FromResult<IDocumentOptions>(new TextDocumentOptions (policy)); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs index 6d3ba5dd14..4b901a2148 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs @@ -1,4 +1,4 @@ -//
+//
// WelcomePageLinkButton.cs
//
// Author:
@@ -193,7 +193,7 @@ namespace MonoDevelop.Ide.WelcomePage var cmdId = uri.Substring ("monodevelop://".Length);
IdeApp.CommandService.DispatchCommand (cmdId, MonoDevelop.Components.Commands.CommandSource.WelcomePage);
} else {
- DesktopService.ShowUrl (uri);
+ IdeServices.DesktopService.ShowUrl (uri);
}
} catch (Exception ex) {
LoggingService.LogInternalError (GettextCatalog.GetString ("Could not open the url '{0}'", uri), ex);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs index a15363e9e0..a1ba2cfffc 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs @@ -1,4 +1,4 @@ -//
+//
// WelcomePageRecentProjectsList.cs
//
// Author:
@@ -53,7 +53,7 @@ namespace MonoDevelop.Ide.WelcomePage itemCount = count; - DesktopService.RecentFiles.Changed += RecentFilesChanged; + IdeServices.DesktopService.RecentFiles.Changed += RecentFilesChanged; SetContent (box); RecentFilesChanged (null, null);
@@ -67,7 +67,7 @@ namespace MonoDevelop.Ide.WelcomePage {
destroyed = true;
base.OnDestroyed ();
- DesktopService.RecentFiles.Changed -= RecentFilesChanged;
+ IdeServices.DesktopService.RecentFiles.Changed -= RecentFilesChanged;
}
void RecentFilesChanged (object sender, EventArgs e)
@@ -109,7 +109,7 @@ namespace MonoDevelop.Ide.WelcomePage //TODO: pinned files int idx = 1;
- foreach (var recent in DesktopService.RecentFiles.GetProjects ().Take (itemCount)) {
+ foreach (var recent in IdeServices.DesktopService.RecentFiles.GetProjects ().Take (itemCount)) {
var filename = recent.FileName;
var accessed = recent.TimeStamp;
@@ -168,7 +168,7 @@ namespace MonoDevelop.Ide.WelcomePage void Button_PinClicked (object sender, EventArgs e)
{
- DesktopService.RecentFiles.SetFavoriteFile (filename, button.Pinned);
+ IdeServices.DesktopService.RecentFiles.SetFavoriteFile (filename, button.Pinned);
}
void Button_Destroyed (object sender, EventArgs e)
@@ -198,7 +198,7 @@ namespace MonoDevelop.Ide.WelcomePage //getting the icon requires probing the file, so handle IO errors
try {
/* delay project service creation.
- icon = IdeApp.Services.ProjectService.FileFormats.GetFileFormats
+ icon = IdeServices.ProjectService.FileFormats.GetFileFormats
(fileName, typeof(Solution)).Length > 0
? "md-solution"
: "md-workspace"; */
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs index 262721a191..9c01c5669a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs @@ -1,4 +1,4 @@ -// +// // WelcomePageSection.cs // // Author: @@ -178,7 +178,7 @@ namespace MonoDevelop.Ide.WelcomePage var cmdId = uri.Substring ("monodevelop://".Length); IdeApp.CommandService.DispatchCommand (cmdId, MonoDevelop.Components.Commands.CommandSource.WelcomePage); } else { - DesktopService.ShowUrl (uri); + IdeServices.DesktopService.ShowUrl (uri); } } catch (Exception ex) { LoggingService.LogInternalError (GettextCatalog.GetString ("Could not open the url '{0}'", uri), ex); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs index bbfcd622bc..91398ef934 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs @@ -1,4 +1,4 @@ -// +// // WelcomePageTipOfTheDaySection.cs // // Author: @@ -65,7 +65,7 @@ namespace MonoDevelop.Ide.WelcomePage label.Xalign = 0; label.Wrap = true; label.WidthRequest = 200; - label.ModifyFont (FontService.SansFont.CopyModified (Gui.Styles.FontScale11)); + label.ModifyFont (IdeServices.FontService.SansFont.CopyModified (Gui.Styles.FontScale11)); label.SetPadding (0, 10); label.Text = currentTip != -1 ? tips[currentTip] : ""; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs index aa19d3d248..4513095e1a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs @@ -107,13 +107,13 @@ namespace MonoDevelop.Ide /// Font to use for treeview pads. Returns null if no custom font is set. /// </summary> public ConfigurationProperty<Pango.FontDescription> CustomPadFont => customPadFont.Value; - readonly Lazy<ConfigurationProperty<Pango.FontDescription>> customPadFont = new Lazy<ConfigurationProperty<Pango.FontDescription>> (() => IdeApp.FontService.GetFontProperty ("Pad")); + readonly Lazy<ConfigurationProperty<Pango.FontDescription>> customPadFont = new Lazy<ConfigurationProperty<Pango.FontDescription>> (() => IdeServices.FontService.GetFontProperty ("Pad")); /// <summary> /// Font to use for output pads. Returns null if no custom font is set. /// </summary> public ConfigurationProperty<Pango.FontDescription> CustomOutputPadFont => customOutputPadFont.Value; - readonly Lazy<ConfigurationProperty<Pango.FontDescription>> customOutputPadFont = new Lazy<ConfigurationProperty<Pango.FontDescription>> (() => IdeApp.FontService.GetFontProperty ("OutputPad")); + readonly Lazy<ConfigurationProperty<Pango.FontDescription>> customOutputPadFont = new Lazy<ConfigurationProperty<Pango.FontDescription>> (() => IdeServices.FontService.GetFontProperty ("OutputPad")); public readonly ConfigurationProperty<bool> EnableCompletionCategoryMode = ConfigurationProperty.Create ("EnableCompletionCategoryMode", false); public readonly ConfigurationProperty<bool> ForceSuggestionMode = ConfigurationProperty.Create ("ForceCompletionSuggestionMode", false); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeVersionInfo.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeVersionInfo.cs index e99dc10440..7654f4664f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeVersionInfo.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeVersionInfo.cs @@ -1,4 +1,4 @@ -// +// // IdeVersionInfo.cs // // Author: @@ -111,7 +111,7 @@ namespace MonoDevelop.Ide else sb.AppendLine (); - var nativeRuntime = DesktopService.GetNativeRuntimeDescription (); + var nativeRuntime = IdeServices.DesktopService.GetNativeRuntimeDescription (); if (!string.IsNullOrEmpty (nativeRuntime)) { sb.Append ('\t'); sb.AppendLine (nativeRuntime); |