update namespace

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

View File

@ -3,6 +3,15 @@
<component name="ChangeListManager">
<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$/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" />
</list>
<option name="SHOW_DIALOG" value="false" />
@ -15,15 +24,30 @@
</component>
<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/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/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/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" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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>
</option>
</component>
@ -40,6 +64,12 @@
<property name="TWShift.3" value="true" />
<property name="TWShift.4" value="true" />
<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 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">
@ -81,7 +111,7 @@
<workItem from="1586792539676" duration="101000" />
<workItem from="1586793017650" duration="506000" />
<workItem from="1586793564564" duration="160000" />
<workItem from="1586793758449" duration="1552000" />
<workItem from="1586793758449" duration="1991000" />
</task>
<servers />
</component>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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/
// Thank you Flexford!
namespace AsmdeffHelper.SyncSolution {
namespace AsmdefHelper.SyncSolution.Editor {
public static class SyncSolutionUtilities {
static SolutionSynchronizer synchronizer;