Add support for Miscellaneous Files #1252
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| using System; | ||
| using System.Composition; | ||
| using Microsoft.CodeAnalysis; | ||
| using OmniSharp.Services; | ||
|
|
||
| namespace OmniSharp.Mef | ||
| { | ||
| [MetadataAttribute] | ||
| [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)] | ||
| public class ExportIProjectSystemAttribute: ExportAttribute | ||
| { | ||
| public string Name { get; } | ||
|
|
||
| public ExportIProjectSystemAttribute(string name) : base(typeof(IProjectSystem)) | ||
| { | ||
| Name = name; | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| namespace OmniSharp.Mef | ||
| { | ||
| public class ProjectSystemMetadata | ||
| { | ||
| public string Name { get; set; } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.CodeAnalysis" Version="2.8.2" /> | ||
|
There was a problem hiding this comment. I think this breaks layering. IIRC, There was a problem hiding this comment. that was definitely the idea, that's also why |
||
| <PackageReference Include="Microsoft.Extensions.Configuration" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.Binder" /> | ||
| <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" /> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| // Adapted from ExtensionOrderer in Roslyn | ||
| using System.Collections.Generic; | ||
|
|
||
| namespace OmniSharp.Utilities | ||
| { | ||
| static partial class ExtensionOrderer | ||
| { | ||
| internal class Graph<T> | ||
| { | ||
| //Dictionary to map between nodes and the names | ||
| private Dictionary<string, Node<T>> Nodes { get; } | ||
| private List<Node<T>> AllNodes { get; } | ||
| private Graph(List<Node<T>> nodesList) | ||
| { | ||
| Nodes = new Dictionary<string, Node<T>>(); | ||
| AllNodes = nodesList; | ||
| } | ||
| internal static Graph<T> GetGraph(List<Node<T>> nodesList) | ||
| { | ||
| var graph = new Graph<T>(nodesList); | ||
|
|
||
| foreach (Node<T> node in graph.AllNodes) | ||
| { | ||
| graph.Nodes[node.Name] = node; | ||
| } | ||
|
|
||
| foreach (Node<T> node in graph.AllNodes) | ||
| { | ||
| foreach (var before in node.Before) | ||
| { | ||
| if (graph.Nodes.ContainsKey(before)) | ||
| { | ||
| var beforeNode = graph.Nodes[before]; | ||
| beforeNode.NodesBeforeMeSet.Add(node); | ||
| } | ||
| } | ||
|
|
||
| foreach (var after in node.After) | ||
| { | ||
| if (graph.Nodes.ContainsKey(after)) | ||
| { | ||
| var afterNode = graph.Nodes[after]; | ||
| node.NodesBeforeMeSet.Add(afterNode); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return graph; | ||
| } | ||
|
|
||
| public bool HasCycles() | ||
| { | ||
| foreach (var node in this.AllNodes) | ||
| { | ||
| if (node.CheckForCycles()) | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| public List<T> TopologicalSort() | ||
| { | ||
| List<T> result = new List<T>(); | ||
| var seenNodes = new HashSet<Node<T>>(); | ||
|
|
||
| foreach (var node in AllNodes) | ||
| { | ||
| Visit(node, result, seenNodes); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| private void Visit(Node<T> node, List<T> result, HashSet<Node<T>> seenNodes) | ||
| { | ||
| if (seenNodes.Add(node)) | ||
| { | ||
| foreach (var before in node.NodesBeforeMeSet) | ||
| { | ||
| Visit(before, result, seenNodes); | ||
| } | ||
|
|
||
| result.Add(node.Extension); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // Adapted from ExtensionOrderer in Roslyn | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Reflection; | ||
| using Microsoft.CodeAnalysis; | ||
|
|
||
| namespace OmniSharp.Utilities | ||
| { | ||
| static partial class ExtensionOrderer | ||
| { | ||
| internal class Node<TNode> | ||
| { | ||
| public string Name { get; set; } | ||
| public List<string> Before { get; set; } | ||
| public List<string> After { get; set; } | ||
| public TNode Extension { get; set; } | ||
| public HashSet<Node<TNode>> NodesBeforeMeSet { get; set; } | ||
|
|
||
| public static Node<TNode> From<TNodeAttribute>(TNode extension, Func<TNodeAttribute, string> nameExtractor) where TNodeAttribute : Attribute | ||
| { | ||
| string name = string.Empty; | ||
| var attribute = extension.GetType().GetCustomAttribute<TNodeAttribute>(); | ||
| if (attribute is TNodeAttribute && !string.IsNullOrEmpty(nameExtractor(attribute))) | ||
| { | ||
| name = nameExtractor(attribute); | ||
| } | ||
| var orderAttributes = extension.GetType().GetCustomAttributes<ExtensionOrderAttribute>(true); | ||
| return new Node<TNode>(extension, name, orderAttributes); | ||
| } | ||
|
|
||
| private Node(TNode extension, string name, IEnumerable<ExtensionOrderAttribute> orderAttributes) | ||
| { | ||
| Extension = extension; | ||
| Name = name; | ||
| Before = new List<string>(); | ||
| After = new List<string>(); | ||
| NodesBeforeMeSet = new HashSet<Node<TNode>>(); | ||
| foreach (var attribute in orderAttributes) | ||
| { | ||
| AddAttribute(attribute); | ||
| } | ||
| } | ||
|
|
||
| private void AddAttribute(ExtensionOrderAttribute attribute) | ||
| { | ||
| if (attribute.Before != null) | ||
| Before.Add(attribute.Before); | ||
| if (attribute.After != null) | ||
| After.Add(attribute.After); | ||
| } | ||
|
|
||
| internal bool CheckForCycles() | ||
| { | ||
| return CheckForCycles(new HashSet<Node<TNode>>()); | ||
| } | ||
|
|
||
| private bool CheckForCycles(HashSet<Node<TNode>> seenNodes) | ||
| { | ||
| if (!seenNodes.Add(this)) | ||
| { | ||
| //Cycle detected | ||
| return true; | ||
| } | ||
|
|
||
| foreach (var before in this.NodesBeforeMeSet) | ||
| { | ||
| if (before.CheckForCycles(seenNodes)) | ||
| return true; | ||
| } | ||
|
|
||
| seenNodes.Remove(this); | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace OmniSharp.Utilities | ||
| { | ||
| static partial class ExtensionOrderer | ||
| { | ||
| /* Returns a sorted order of the nodes if such a sorting exists, else returns the unsorted list */ | ||
| public static IEnumerable<TExtension> GetOrderedOrUnorderedList<TExtension, TAttribute>(IEnumerable<TExtension> unsortedList, Func<TAttribute, string> nameExtractor) where TAttribute: Attribute | ||
| { | ||
| var nodesList = unsortedList.Select(elem => Node<TExtension>.From(elem, nameExtractor)); | ||
| var graph = Graph<TExtension>.GetGraph(nodesList.ToList()); | ||
| return graph.HasCycles() ? unsortedList : graph.TopologicalSort(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Naming: remove the "I" and go with "ExportProjectSystemAttribute".