Merge pull request RobinKa#72 from RobinKa/feature/vsix

Visual Studio extension for NetPrints editor
HuaFangYun · May 5, 2019 · 389977c · 389977c
2 parents 308bab4 + 17d3749
commit 389977c
Show file tree

Hide file tree

Showing 50 changed files with 1,993 additions and 821 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,5 +7,5 @@ mono: none
 script:
   - choco install dotnetcore-sdk --pre
   - dotnet --version
-  - dotnet build NetPrints.sln -c Release
+# - dotnet build NetPrints.sln -c Release
   - dotnet test
diff --git a/NetPrints.sln b/NetPrints.sln
@@ -16,7 +16,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CSharpRuleSet.ruleset = CSharpRuleSet.ruleset
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPrintsCLI", "NetPrintsCLI\NetPrintsCLI.csproj", "{141EFA2F-E182-4767-8641-27840507EF8A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetPrintsCLI", "NetPrintsCLI\NetPrintsCLI.csproj", "{141EFA2F-E182-4767-8641-27840507EF8A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPrintsVSIX", "NetPrintsVSIX\NetPrintsVSIX.csproj", "{F67E1137-28AA-44BD-A173-ECE01D50DC44}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -44,6 +46,10 @@ Global
 		{141EFA2F-E182-4767-8641-27840507EF8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{141EFA2F-E182-4767-8641-27840507EF8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{141EFA2F-E182-4767-8641-27840507EF8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F67E1137-28AA-44BD-A173-ECE01D50DC44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F67E1137-28AA-44BD-A173-ECE01D50DC44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F67E1137-28AA-44BD-A173-ECE01D50DC44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F67E1137-28AA-44BD-A173-ECE01D50DC44}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/NetPrints/Compatibility/ClassGraph.cs b/NetPrints/Compatibility/ClassGraph.cs
diff --git a/NetPrints/Compatibility/ConstructorSpecifier.cs b/NetPrints/Compatibility/ConstructorSpecifier.cs
diff --git a/NetPrints/Compatibility/MethodGraph.cs b/NetPrints/Compatibility/MethodGraph.cs
diff --git a/NetPrints/Compatibility/MethodSpecifier.cs b/NetPrints/Compatibility/MethodSpecifier.cs
diff --git a/NetPrints/Compatibility/Variable.cs b/NetPrints/Compatibility/Variable.cs
diff --git a/NetPrints/Compatibility/VariableNode.cs b/NetPrints/Compatibility/VariableNode.cs
diff --git a/NetPrints/Core/ClassGraph.cs b/NetPrints/Core/ClassGraph.cs
@@ -140,5 +140,10 @@ public TypeSpecifier Type
             get => new TypeSpecifier(FullName, SuperType.IsEnum, SuperType.IsInterface,
                 DeclaredGenericArguments.Cast<BaseType>().ToList());
         }
+
+        public ClassGraph()
+        {
+            _ = new ClassReturnNode(this);
+        }
     }
 }
diff --git a/NetPrints/Core/MethodGraph.cs b/NetPrints/Core/MethodGraph.cs
@@ -112,9 +112,6 @@ public MethodGraph(string name)
         [OnDeserialized]
         private void OnDeserialized(StreamingContext context)
         {
-            // Compatibility
-            FixVisibility(context);
-
             // Call Node.OnMethodDeserialized until the types don't change anymore
             // or a max iteration was reached.
             // TODO: Sort nodes by depth and propagate in order instead of

diff --git a/NetPrints/Core/NetPrintsUtil.cs b/NetPrints/Core/NetPrintsUtil.cs
@@ -46,7 +46,7 @@ public static bool IsVisible(TypeSpecifier fromType, TypeSpecifier type, MemberV
             }
             else if (isSubclassOf(fromType, type))
             {
-                return visibility.HasFlag(MemberVisibility.ProtectedOrPublic);
+                return visibility.HasFlag(MemberVisibility.Protected) || visibility.HasFlag(MemberVisibility.Public);
             }
 
             return visibility.HasFlag(MemberVisibility.Public);