Fix PR Comments

bkudiess · bkudiess · commit e6d5d7cba4bf · 2020-03-03T14:25:59.000-08:00
diff --git a/Plugins/HelloWorldCSharp/App.config b/Plugins/HelloWorldCSharp/App.config
diff --git a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
@@ -37,7 +37,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="App.config" />
     <None Include="plugin.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj b/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj
@@ -32,7 +32,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="plugin.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/app.config b/Plugins/Wox.Plugin.BrowserBookmark/app.config
diff --git a/Plugins/Wox.Plugin.Folder/Main.cs b/Plugins/Wox.Plugin.Folder/Main.cs
@@ -19,6 +19,7 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, ISavable, IContextMe
 
         private string DefaultFolderSubtitleString = "Ctrl + Enter to open the directory";
 
+        private static string _fileExplorerProgramName = "explorer";
         private static List<string> _driverNames;
         private PluginInitContext _context;
 
@@ -102,7 +103,7 @@ private Result CreateFolderResult(string title, string subtitle, string path, Qu
                     {
                         try
                         {
-                            Process.Start("explorer", path);
+                            Process.Start(_fileExplorerProgramName, path);
                             return true;
                         }
                         catch (Exception ex)
@@ -254,7 +255,7 @@ private static Result CreateFileResult(string filePath, Query query)
                 {
                     try
                     {
-                        Process.Start("explorer", filePath);
+                        Process.Start(_fileExplorerProgramName, filePath);
                     }
                     catch (Exception ex)
                     {
@@ -285,7 +286,7 @@ private static Result CreateOpenCurrentFolderResult(string incompleteName, strin
                 Score = 500,
                 Action = c =>
                 {
-                    Process.Start("explorer", search);
+                    Process.Start(_fileExplorerProgramName, search);
                     return true;
                 }
             };
diff --git a/Plugins/Wox.Plugin.Program/Programs/FileSystemFolderSourceShallow.cs b/Plugins/Wox.Plugin.Program/Programs/FileSystemFolderSourceShallow.cs
diff --git a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
@@ -39,10 +39,6 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="Programs\FileSystemFolderSourceShallow.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <Reference Include="AppxPackagingTlb">
       <HintPath>.\AppxPackagingTlb.dll</HintPath>
diff --git a/Wox.Infrastructure/Properties/AssemblyInfo.cs b/Wox.Infrastructure/Properties/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+﻿using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Wox")]
+[assembly: InternalsVisibleTo("Wox.Core")]
+[assembly: InternalsVisibleTo("Wox.Test")]
diff --git a/Wox.Infrastructure/StringMatcher.cs b/Wox.Infrastructure/StringMatcher.cs
@@ -19,7 +19,7 @@ public StringMatcher(IAlphabet alphabet = null)
             _alphabet = alphabet;
         }
 
-        public static StringMatcher Instance { get; set; }
+        public static StringMatcher Instance { get; internal set; }
 
         [Obsolete("This method is obsolete and should not be used. Please use the static function StringMatcher.FuzzySearch")]
         public static int Score(string source, string target)
diff --git a/Wox.Infrastructure/UserSettings/Settings.cs b/Wox.Infrastructure/UserSettings/Settings.cs
@@ -28,7 +28,7 @@ public class Settings : BaseModel
         public bool ShouldUsePinyin { get; set; } = true;
 
 
-        public StringMatcher.SearchPrecisionScore QuerySearchPrecision { get; private set; } = StringMatcher.SearchPrecisionScore.Regular;
+        internal StringMatcher.SearchPrecisionScore QuerySearchPrecision { get; private set; } = StringMatcher.SearchPrecisionScore.Regular;
 
         [JsonIgnore]
         public string QuerySearchPrecisionString
diff --git a/Wox.Infrastructure/Wox.Infrastructure.csproj b/Wox.Infrastructure/Wox.Infrastructure.csproj
@@ -52,10 +52,6 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="pinyindb\pinyin_gwoyeu_mapping.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/Wox.Plugin/PluginInitContext.cs b/Wox.Plugin/PluginInitContext.cs
@@ -4,7 +4,7 @@ namespace Wox.Plugin
 {
     public class PluginInitContext
     {
-        public PluginMetadata CurrentPluginMetadata { get; set; }
+        public PluginMetadata CurrentPluginMetadata { get; internal set; }
 
         /// <summary>
         /// Public APIs for plugin invocation
diff --git a/Wox.Plugin/PluginMetadata.cs b/Wox.Plugin/PluginMetadata.cs
@@ -24,7 +24,7 @@ public class PluginMetadata : BaseModel
         public string PluginDirectory
         {
             get { return _pluginDirectory; }
-            set
+            internal set
             {
                 _pluginDirectory = value;
                 ExecuteFilePath = Path.Combine(value, ExecuteFileName);
diff --git a/Wox.Plugin/PluginPair.cs b/Wox.Plugin/PluginPair.cs
@@ -2,8 +2,8 @@
 {
     public class PluginPair
     {
-        public IPlugin Plugin { get; set; }
-        public PluginMetadata Metadata { get; set; }
+        public IPlugin Plugin { get; internal set; }
+        public PluginMetadata Metadata { get; internal set; }
 
         
 
diff --git a/Wox.Plugin/Properties/AssemblyInfo.cs b/Wox.Plugin/Properties/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+﻿using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Wox")]
+[assembly: InternalsVisibleTo("Wox.Core")]
+[assembly: InternalsVisibleTo("Wox.Test")]
diff --git a/Wox.Plugin/Query.cs b/Wox.Plugin/Query.cs
@@ -23,15 +23,15 @@ public Query(string rawQuery, string search, string[] terms, string actionKeywor
         /// Raw query, this includes action keyword if it has
         /// We didn't recommend use this property directly. You should always use Search property.
         /// </summary>
-        public string RawQuery { get; set; }
+        public string RawQuery { get; internal set; }
 
         /// <summary>
         /// Search part of a query.
         /// This will not include action keyword if exclusive plugin gets it, otherwise it should be same as RawQuery.
         /// Since we allow user to switch a exclusive plugin to generic plugin, 
         /// so this property will always give you the "real" query part of the query
         /// </summary>
-        public string Search { get; set; }
+        public string Search { get; internal set; }
 
         /// <summary>
         /// The raw query splited into a string array.
@@ -96,10 +96,10 @@ private string SplitSearch(int index)
         public override string ToString() => RawQuery;
 
         [Obsolete("Use ActionKeyword, this property will be removed in v1.3.0")]
-        public string ActionName { get; set; }
+        public string ActionName { get; internal set; }
 
         [Obsolete("Use Search instead, this property will be removed in v1.3.0")]
-        public List<string> ActionParameters { get; set; }
+        public List<string> ActionParameters { get; internal set; }
 
         [Obsolete("Use Search instead, this method will be removed in v1.3.0")]
         public string GetAllRemainingParameter() => Search;
diff --git a/Wox.Plugin/Result.cs b/Wox.Plugin/Result.cs
@@ -55,7 +55,7 @@ public string IcoPath
         /// <summary>
         /// Only resulsts that originQuery match with curren query will be displayed in the panel
         /// </summary>
-        public Query OriginQuery { get; set; }
+        internal Query OriginQuery { get; set; }
 
         /// <summary>
         /// Plugin directory
@@ -122,6 +122,6 @@ public Result() { }
         /// <summary>
         /// Plugin ID that generated this result
         /// </summary>
-        public string PluginID { get; set; }
+        public string PluginID { get; internal set; }
     }
 }
diff --git a/Wox.Plugin/Wox.Plugin.csproj b/Wox.Plugin/Wox.Plugin.csproj
@@ -58,8 +58,4 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
 </Project>
diff --git a/Wox/App.config b/Wox/App.config
diff --git a/Wox/Helper/SingleInstance.cs b/Wox/Helper/SingleInstance.cs

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, ISavable, IContextMe`
`19`	`19`
`20`	`20`	`private string DefaultFolderSubtitleString = "Ctrl + Enter to open the directory";`
`21`	`21`
	`22`	`+ private static string _fileExplorerProgramName = "explorer";`
`22`	`23`	`private static List<string> _driverNames;`
`23`	`24`	`private PluginInitContext _context;`
`24`	`25`
`@@ -102,7 +103,7 @@ private Result CreateFolderResult(string title, string subtitle, string path, Qu`
`102`	`103`	`{`
`103`	`104`	`try`
`104`	`105`	`{`
`105`		`- Process.Start("explorer", path);`
	`106`	`+ Process.Start(_fileExplorerProgramName, path);`
`106`	`107`	`return true;`
`107`	`108`	`}`
`108`	`109`	`catch (Exception ex)`
`@@ -254,7 +255,7 @@ private static Result CreateFileResult(string filePath, Query query)`
`254`	`255`	`{`
`255`	`256`	`try`
`256`	`257`	`{`
`257`		`- Process.Start("explorer", filePath);`
	`258`	`+ Process.Start(_fileExplorerProgramName, filePath);`
`258`	`259`	`}`
`259`	`260`	`catch (Exception ex)`
`260`	`261`	`{`
`@@ -285,7 +286,7 @@ private static Result CreateOpenCurrentFolderResult(string incompleteName, strin`
`285`	`286`	`Score = 500,`
`286`	`287`	`Action = c =>`
`287`	`288`	`{`
`288`		`- Process.Start("explorer", search);`
	`289`	`+ Process.Start(_fileExplorerProgramName, search);`
`289`	`290`	`return true;`
`290`	`291`	`}`
`291`	`292`	`};`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public StringMatcher(IAlphabet alphabet = null)`
`19`	`19`	`_alphabet = alphabet;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public static StringMatcher Instance { get; set; }`
	`22`	`+ public static StringMatcher Instance { get; internal set; }`
`23`	`23`
`24`	`24`	`[Obsolete("This method is obsolete and should not be used. Please use the static function StringMatcher.FuzzySearch")]`
`25`	`25`	`public static int Score(string source, string target)`