MultipleEditとUnityInternalの関係を整理

.idea/.idea.AsmdefHelper/.idea/contentModel.xml

@@ -9,6 +9,7 @@
       <e p="AsmdefHelper.Example.Fuga.csproj" t="IncludeRecursive" />
       <e p="AsmdefHelper.Example.Hoge.csproj" t="IncludeRecursive" />
       <e p="AsmdefHelper.Example.Piyo.csproj" t="IncludeRecursive" />
+      <e p="AsmdefHelper.MultipleEdit.Editor.csproj" t="IncludeRecursive" />
       <e p="AsmdefHelper.sln" t="IncludeFlat" />
       <e p="AsmdefHelper.SyncSolution.Editor.csproj" t="IncludeRecursive" />
       <e p="Assets" t="Include">
@@ -40,7 +41,7 @@
           </e>
           <e p="MultipleEdit" t="Include">
             <e p="Editor" t="Include">
-              <e p="AsmdefHelper.MultipleEdit.Editor.asmref" t="Include" />
+              <e p="AsmdefHelper.MultipleEdit.Editor.asmdef" t="Include" />
               <e p="AsmdefMultiEditWindow.cs" t="Include" />
             </e>
           </e>
@@ -51,6 +52,8 @@
             </e>
           </e>
           <e p="Unity.InternalAPIEditorBridgeDev.001" t="Include">
+            <e p="InspectorWindowWrapper.cs" t="Include" />
+            <e p="ProjectBrowserWrapper.cs" t="Include" />
             <e p="SolutionSynchronizerWrapper.cs" t="Include" />
             <e p="Unity.InternalAPIEditorBridgeDev.001.asmdef" t="Include" />
           </e>

.idea/.idea.AsmdefHelper/.idea/workspace.xml

@@ -2,14 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="f71251e0-52ab-4cea-859f-4c363c01a121" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs.meta" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs.meta" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs.meta" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.AsmdefHelper/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.AsmdefHelper/.idea/contentModel.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.AsmdefHelper/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.AsmdefHelper/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmref" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmref" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmref.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmref.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -22,6 +24,7 @@
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphView.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/Fuga/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
@@ -30,6 +33,7 @@
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/Unity.InternalAPIEditorBridgeDev.001.asmdef" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs" root0="FORCE_HIGHLIGHTING" />
@@ -44,12 +48,14 @@
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/Example/Fuga/NewBehaviourScript.cs" />
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.cs" />
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.cs" />
-        <option value="$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs" />
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs" />
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/UnityInternal/SolutionSynchronizerWrapper.cs" />
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/UnityInternal/SyncSolutionUtilities.cs" />
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs" />
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" />
+        <option value="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs" />
+        <option value="$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs" />
+        <option value="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs" />
       </list>
     </option>
   </component>
@@ -115,7 +121,7 @@
       <workItem from="1586793564564" duration="160000" />
       <workItem from="1586793758449" duration="2076000" />
       <workItem from="1586872725062" duration="657000" />
-      <workItem from="1586951660938" duration="989000" />
+      <workItem from="1586951660938" duration="2646000" />
     </task>
     <servers />
   </component>

Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmdef

@@ -0,0 +1,17 @@
+{
+    "name": "AsmdefHelper.MultipleEdit.Editor",
+    "references": [
+        "GUID:211243abc45174c45b3a6c275ea126b9"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmdef.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 43a16440f46e8054e8bb12c38f573975
+guid: ddba71eed1843ba40a83179bf71e2848
-AssemblyDefinitionReferenceImporter:
+AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmref

@@ -1,3 +0,0 @@
-{
-    "reference": "GUID:211243abc45174c45b3a6c275ea126b9"
-}

Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using AsmdefHelper.UnityInternal;
 using UnityEditor;
 using UnityEditor.Experimental.AssetImporters;
 using UnityEditorInternal;
@@ -9,8 +10,9 @@ namespace AsmdefHelper.MultipleEdit.Editor {
     public class AsmdefMultiEditWindow : EditorWindow {
         [MenuItem("Window/Asmdef Helper/Find all asmdef in project")]
         public static void Search() {
-            var projectBrowser = GetWindow<ProjectBrowser>();
+            var browser = CreateInstance<ProjectBrowserWrapper>();
-            projectBrowser.SetSearch("t:AssemblyDefinitionAsset");
+            browser.GetProjectBrowser();
+            browser.SetSearch("t:AssemblyDefinitionAsset");
         }
 
         [MenuItem("Window/Asmdef Helper/Open selected asmdef inspector view")]
@@ -23,9 +25,10 @@ namespace AsmdefHelper.MultipleEdit.Editor {
 
             foreach (var adf in asmdefs) {
                 Selection.objects = new[] { adf };
-                var w = CreateWindow<InspectorWindow>();
+                var w = CreateInstance<InspectorWindowWrapper>();
+                w.GetInspectorWindow();
                 // LockすることでInspectorWindowの表示を固定する
-                w.isLocked = true;
+                w.Lock(true);
             }
         }
     }

Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs

@@ -0,0 +1,17 @@
+using UnityEditor;
+
+namespace AsmdefHelper.UnityInternal {
+    public class InspectorWindowWrapper : EditorWindow{
+        InspectorWindow inspectorWindow;
+
+        public void GetInspectorWindow() {
+            inspectorWindow = CreateWindow<InspectorWindow>();
+        }
+
+        public void Lock(bool isLock) {
+            if (inspectorWindow != null) {
+                inspectorWindow.isLocked = isLock;
+            }
+        }
+    }
+}

Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ab307b553b134091996ec036836c42b8
+timeCreated: 1586954046

Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs

@@ -0,0 +1,17 @@
+using UnityEditor;
+
+namespace AsmdefHelper.UnityInternal {
+    public class ProjectBrowserWrapper : EditorWindow {
+        ProjectBrowser projectBrowser;
+
+        public void GetProjectBrowser() {
+            projectBrowser = GetWindow<ProjectBrowser>();
+        }
+
+        public void SetSearch(string searchText) {
+            if (projectBrowser != null) {
+                projectBrowser.SetSearch(searchText);
+            }
+        }
+    }
+}

Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 78b9d6d4797040088ab730c9be37c6b9
+timeCreated: 1586952941