rose/AsmdefHelper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update namespace

Browse Source
This commit is contained in:
nakano yosuke 2020-04-14 01:38:37 +09:00
parent 259075c83a
commit 554e1dd773
11 changed files with 59 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.idea/.idea.AsmdefHelper/.idea/workspace.xml generated
View File

@ -3,6 +3,15 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f71251e0-52ab-4cea-859f-4c363c01a121" name="Default Changelist" comment=""> <list default="true" id="f71251e0-52ab-4cea-859f-4c363c01a121" name="Default Changelist" comment="">
<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$/.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/DependencyGraph/Editor/AsmdefDependency.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefDependency.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphView.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/Example/Fuga/NewBehaviourScript.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Example/Fuga/NewBehaviourScript.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/Example/NewBehaviourScript.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Example/NewBehaviourScript.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.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" />
<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/SyncSolution/Editor/SyncSolutionUtilities.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -15,15 +24,30 @@
</component> </component>
<component name="HighlightingSettingsPerFile"> <component name="HighlightingSettingsPerFile">
<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/Unity.InternalAPIEditorBridgeDev.001.asmdef" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.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/DependencyGraph/Editor/AsmdefGraphView.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/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/Fuga/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefDependency.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.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/MultipleEdit/Editor/AsmdefMultiEditWindow.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs" root0="FORCE_HIGHLIGHTING" />
</component> </component>
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" /> <option value="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" />
<option value="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefDependency.cs" />
<option value="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs" />
<option value="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs" />
<option value="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphView.cs" />
<option value="$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs" />
<option value="$PROJECT_DIR$/Assets/AsmdefHelper/Example/NewBehaviourScript.cs" />
<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" />
</list> </list>
</option> </option>
</component> </component>
@ -40,6 +64,12 @@
<property name="TWShift.3" value="true" /> <property name="TWShift.3" value="true" />
<property name="TWShift.4" value="true" /> <property name="TWShift.4" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
<property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.eslint" value="(autodetect)" />
<property name="node.js.selected.package.tslint" value="(autodetect)" />
</component> </component>
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor"> <component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
<configuration name="Attach to Unity Editor &amp; Play" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="UNITY_ATTACH_AND_PLAY" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost"> <configuration name="Attach to Unity Editor &amp; Play" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="UNITY_ATTACH_AND_PLAY" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
@ -81,7 +111,7 @@
<workItem from="1586792539676" duration="101000" /> <workItem from="1586792539676" duration="101000" />
<workItem from="1586793017650" duration="506000" /> <workItem from="1586793017650" duration="506000" />
<workItem from="1586793564564" duration="160000" /> <workItem from="1586793564564" duration="160000" />
<workItem from="1586793758449" duration="1552000" /> <workItem from="1586793758449" duration="1991000" />
</task> </task>
<servers /> <servers />
</component> </component>

2
Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefDependency.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace AsmdefGraph.Editor { namespace AsmdefHelper.DependencyGraph.Editor {
public class AsmdefDependency { public class AsmdefDependency {
public string DependsFrom { get; } public string DependsFrom { get; }
public IEnumerable<string> DependsTo { get; } public IEnumerable<string> DependsTo { get; }

4
Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs
View File

@ -3,7 +3,7 @@ using System.Linq;
using UnityEditor; using UnityEditor;
using UnityEditor.Compilation; using UnityEditor.Compilation;
namespace AsmdefGraph.Editor { namespace AsmdefHelper.DependencyGraph.Editor {
public class AsmdefGraphEditorWindow : EditorWindow { public class AsmdefGraphEditorWindow : EditorWindow {
[MenuItem("Window/Open Asmdef Graph Window")] [MenuItem("Window/Open Asmdef Graph Window")]
public static void Open() { public static void Open() {
@ -17,7 +17,7 @@ namespace AsmdefGraph.Editor {
foreach (var asmdef in asmdefs) { foreach (var asmdef in asmdefs) {
allDependencies.Add( allDependencies.Add(
new AsmdefDependency( new AsmdefDependency(
asmdef.name, asmdef.name,
asmdef.assemblyReferences?.Select(x => x.name) ?? new string[0]) asmdef.assemblyReferences?.Select(x => x.name) ?? new string[0])
); );
} }

3
Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphView.cs
View File

@ -1,9 +1,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using UnityEditor.Experimental.GraphView; using UnityEditor.Experimental.GraphView;
using UnityEngine.UIElements; using UnityEngine.UIElements;
namespace AsmdefGraph.Editor { namespace AsmdefHelper.DependencyGraph.Editor {
public class AsmdefGraphView : GraphView { public class AsmdefGraphView : GraphView {
public AsmdefGraphView(IEnumerable<AsmdefDependency> asmdefs) : base() { public AsmdefGraphView(IEnumerable<AsmdefDependency> asmdefs) : base() {
// zoom可能に // zoom可能に

2
Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs
View File

@ -1,6 +1,6 @@
using UnityEditor.Experimental.GraphView; using UnityEditor.Experimental.GraphView;
namespace AsmdefGraph.Editor { namespace AsmdefHelper.DependencyGraph.Editor {
public class AsmdefNode : Node { public class AsmdefNode : Node {
public readonly Port LeftPort; public readonly Port LeftPort;
public readonly Port RightPort; public readonly Port RightPort;

2
Assets/AsmdefHelper/Example/Fuga/NewBehaviourScript.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
namespace AsmdefGraph.Example.Fuga { namespace AsmdefHelper.Example.Fuga {
public class NewBehaviourScript : MonoBehaviour { public class NewBehaviourScript : MonoBehaviour {
// Start is called before the first frame update // Start is called before the first frame update
void Start() { void Start() {

2
Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
namespace AsmdefGraph.Example.Hoge { namespace AsmdefHelper.Example.Hoge {
public class NewBehaviourScript : MonoBehaviour { public class NewBehaviourScript : MonoBehaviour {
// Start is called before the first frame update // Start is called before the first frame update
void Start() { void Start() {

2
Assets/AsmdefHelper/Example/NewBehaviourScript.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
namespace AsmdefGraph.Example { namespace AsmdefHelper.Example {
public class NewBehaviourScript : MonoBehaviour { public class NewBehaviourScript : MonoBehaviour {
// Start is called before the first frame update // Start is called before the first frame update
void Start() { void Start() {

2
Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
namespace AsmdefGraph.Example.Piyo { namespace AsmdefHelper.Example.Piyo {
public class NewBehaviourScript : MonoBehaviour { public class NewBehaviourScript : MonoBehaviour {
// Start is called before the first frame update // Start is called before the first frame update
void Start() { void Start() {

45
Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs
View File

@ -5,32 +5,26 @@ using UnityEditor.Experimental.AssetImporters;
using UnityEditorInternal; using UnityEditorInternal;
using UnityEngine; using UnityEngine;
namespace AsmdefMultiEdit.Editor namespace AsmdefHelper.MultipleEdit.Editor {
{ public class AsmdefMultiEditWindow : EditorWindow {
public class AsmdefMultiEditWindow : EditorWindow
{
static IList<InspectorWindow> windows = new List<InspectorWindow>(); static IList<InspectorWindow> windows = new List<InspectorWindow>();
[MenuItem("Window/Asmdef Multiple Edit/1.Search asmdef in project")] [MenuItem("Window/Asmdef Helper/Multiple Edit/1.Search asmdef in project")]
public static void Search() public static void Search() {
{
var projectBrowser = GetWindow<ProjectBrowser>(); var projectBrowser = GetWindow<ProjectBrowser>();
projectBrowser.SetSearch("t:AssemblyDefinitionAsset"); projectBrowser.SetSearch("t:AssemblyDefinitionAsset");
} }
[MenuItem("Window/Asmdef Multiple Edit/2.Open selected asmdef inspector view")] [MenuItem("Window/Asmdef Helper/Multiple Edit/2.Open selected asmdef inspector view")]
public static void Open() public static void Open() {
{
var asmdefs = Selection.GetFiltered(typeof(AssemblyDefinitionAsset), SelectionMode.TopLevel); var asmdefs = Selection.GetFiltered(typeof(AssemblyDefinitionAsset), SelectionMode.TopLevel);
if (!asmdefs.Any()) if (!asmdefs.Any()) {
{
Debug.Log("no AssemblyDefinitionAsset"); Debug.Log("no AssemblyDefinitionAsset");
return; return;
} }
CloseWindows(); CloseWindows();
foreach (var adf in asmdefs) foreach (var adf in asmdefs) {
{
Selection.objects = new[] { adf }; Selection.objects = new[] { adf };
var w = CreateWindow<InspectorWindow>(); var w = CreateWindow<InspectorWindow>();
// LockすることでInspectorWindowの表示を固定する // LockすることでInspectorWindowの表示を固定する
@ -39,31 +33,28 @@ namespace AsmdefMultiEdit.Editor
} }
} }
[MenuItem("Window/Asmdef Multiple Edit/3.All apply and close")] [MenuItem("Window/Asmdef Helper/Multiple Edit/3.All apply and close")]
public static void Apply() public static void Apply() {
{ foreach (var w in windows) {
foreach (var w in windows) foreach (var editor in w.tracker.activeEditors) {
{
foreach (var editor in w.tracker.activeEditors)
{
var assetImporterEditor = editor as AssetImporterEditor; var assetImporterEditor = editor as AssetImporterEditor;
if (assetImporterEditor != null && assetImporterEditor.HasModified()) if (assetImporterEditor != null && assetImporterEditor.HasModified()) {
{
assetImporterEditor.ApplyAndImport(); assetImporterEditor.ApplyAndImport();
} }
} }
w.Close(); w.Close();
} }
windows.Clear(); windows.Clear();
} }
static void CloseWindows() static void CloseWindows() {
{ foreach (var w in windows) {
foreach (var w in windows)
{
w.Close(); w.Close();
} }
windows.Clear(); windows.Clear();
} }
} }

2
Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs
View File

@ -7,7 +7,7 @@ using UnityEngine;
// https://forum.unity.com/threads/solved-unity-not-generating-sln-file-from-assets-open-c-project.538487/ // https://forum.unity.com/threads/solved-unity-not-generating-sln-file-from-assets-open-c-project.538487/
// Thank you Flexford! // Thank you Flexford!
namespace AsmdeffHelper.SyncSolution { namespace AsmdefHelper.SyncSolution.Editor {
public static class SyncSolutionUtilities { public static class SyncSolutionUtilities {
static SolutionSynchronizer synchronizer; static SolutionSynchronizer synchronizer;