diff --git a/CLAUDE.md b/CLAUDE.md index 6649708..1e76076 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -28,7 +28,7 @@ source in four target languages. The solution uses: - **ktsu.Sdk** — custom SDK providing shared build configuration - **MSTest.Sdk** — test project SDK with Microsoft Testing Platform - `Coder.Core` cross-targets `net10.0` and `net9.0`; `Coder.Graph` and `Coder.Editor` are `net10.0` - only, because `ktsu.ImGuiNodeEditor` and `ktsu.ImGui.App` are + only, because `ktsu.ImGui.NodeEditor` and `ktsu.ImGui.App` are ### Projects @@ -60,7 +60,7 @@ source in four target languages. The solution uses: - `ktsu.CodeBlocker` — writes generated source, owning indentation and the line terminator - `ktsu.DeepClone` — cloning support for AST nodes - `YamlDotNet` — YAML serialization -- `ktsu.ImGuiNodeEditor`, `Hexa.NET.ImGui`, `Hexa.NET.ImNodes` — the node-graph editor +- `ktsu.ImGui.NodeEditor`, `Hexa.NET.ImGui`, `Hexa.NET.ImNodes` — the node-graph editor - `ktsu.ImGui.App` — the desktop application shell - `ktsu.UndoRedo.Core` — the graph editor's undo stack - `ktsu.Essentials` — filesystem and persistence providers the editor reads and writes through diff --git a/Coder.Graph/AstGraph.cs b/Coder.Graph/AstGraph.cs index 1cb46c4..1eea4c2 100644 --- a/Coder.Graph/AstGraph.cs +++ b/Coder.Graph/AstGraph.cs @@ -7,7 +7,7 @@ namespace ktsu.Coder.Graph; using System.Linq; using System.Numerics; using ktsu.Coder.Ast; -using ktsu.ImGuiNodeEditor; +using ktsu.ImGui.NodeEditor; /// /// A node-editor view of an AST, and the editing operations that keep the two in step. diff --git a/Coder.Graph/AstGraphEditor.cs b/Coder.Graph/AstGraphEditor.cs index a74bfb7..566bcc8 100644 --- a/Coder.Graph/AstGraphEditor.cs +++ b/Coder.Graph/AstGraphEditor.cs @@ -9,7 +9,7 @@ namespace ktsu.Coder.Graph; using Hexa.NET.ImGui; using Hexa.NET.ImNodes; using ktsu.Coder.Ast; -using ktsu.ImGuiNodeEditor; +using ktsu.ImGui.NodeEditor; using ktsu.UndoRedo; using ktsu.UndoRedo.Contracts; using ktsu.UndoRedo.Core.Services; diff --git a/Coder.Graph/Coder.Graph.csproj b/Coder.Graph/Coder.Graph.csproj index ea9aeba..91ddc1b 100644 --- a/Coder.Graph/Coder.Graph.csproj +++ b/Coder.Graph/Coder.Graph.csproj @@ -3,14 +3,14 @@ - net10.0 - + diff --git a/Coder.Test/Editor/GeneratedCodeHighlightingTests.cs b/Coder.Test/Editor/GeneratedCodeHighlightingTests.cs index abc9d7b..b0eff9e 100644 --- a/Coder.Test/Editor/GeneratedCodeHighlightingTests.cs +++ b/Coder.Test/Editor/GeneratedCodeHighlightingTests.cs @@ -5,6 +5,7 @@ namespace ktsu.Coder.Test.Editor; using ktsu.Coder.Ast; using ktsu.Coder.Languages; using ktsu.ImGui.SyntaxHighlighting; +using ktsu.SyntaxHighlighting; using Microsoft.VisualStudio.TestTools.UnitTesting; /// diff --git a/Coder.Test/Graph/AstGraphEditorHistoryTests.cs b/Coder.Test/Graph/AstGraphEditorHistoryTests.cs index b33f527..9627419 100644 --- a/Coder.Test/Graph/AstGraphEditorHistoryTests.cs +++ b/Coder.Test/Graph/AstGraphEditorHistoryTests.cs @@ -5,7 +5,7 @@ namespace ktsu.Coder.Test.Graph; using System.Numerics; using ktsu.Coder.Ast; using ktsu.Coder.Graph; -using ktsu.ImGuiNodeEditor; +using ktsu.ImGui.NodeEditor; using ktsu.UndoRedo; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/Coder.Test/Graph/AstGraphEditorTests.cs b/Coder.Test/Graph/AstGraphEditorTests.cs index ed5de4c..fa577cd 100644 --- a/Coder.Test/Graph/AstGraphEditorTests.cs +++ b/Coder.Test/Graph/AstGraphEditorTests.cs @@ -9,7 +9,7 @@ namespace ktsu.Coder.Test.Graph; using ktsu.Coder.Graph; using ktsu.ImGui.App; using ktsu.ImGui.App.Testing; -using ktsu.ImGuiNodeEditor; +using ktsu.ImGui.NodeEditor; using Microsoft.VisualStudio.TestTools.UnitTesting; /// @@ -274,7 +274,7 @@ public void Editor_KeepsTheLayoutInsideTheView() using ImGuiAppHarness harness = ImGuiAppHarness.Start(ConfigFor(editor), Options); harness.Step(300); - foreach (ktsu.ImGuiNodeEditor.Node node in editor.Graph.Engine.Nodes) + foreach (ktsu.ImGui.NodeEditor.Node node in editor.Graph.Engine.Nodes) { // One assertion per bound rather than a range: it says which edge the node went over. Assert.IsGreaterThan(-200f, node.Position.X, $"{node.Name} drifted off the left to x {node.Position.X}"); diff --git a/Coder.Test/Graph/AstGraphLayoutTests.cs b/Coder.Test/Graph/AstGraphLayoutTests.cs index 867d3be..004a1f6 100644 --- a/Coder.Test/Graph/AstGraphLayoutTests.cs +++ b/Coder.Test/Graph/AstGraphLayoutTests.cs @@ -5,7 +5,7 @@ namespace ktsu.Coder.Test.Graph; using System.Numerics; using ktsu.Coder.Ast; using ktsu.Coder.Graph; -using ktsu.ImGuiNodeEditor; +using ktsu.ImGui.NodeEditor; using Microsoft.VisualStudio.TestTools.UnitTesting; /// diff --git a/Coder.Test/Graph/AstGraphRerootTests.cs b/Coder.Test/Graph/AstGraphRerootTests.cs index 633f7f9..1cf923a 100644 --- a/Coder.Test/Graph/AstGraphRerootTests.cs +++ b/Coder.Test/Graph/AstGraphRerootTests.cs @@ -6,7 +6,7 @@ namespace ktsu.Coder.Test.Graph; using ktsu.Coder.Ast; using ktsu.Coder.Graph; using ktsu.Coder.Languages; -using ktsu.ImGuiNodeEditor; +using ktsu.ImGui.NodeEditor; using Microsoft.VisualStudio.TestTools.UnitTesting; /// diff --git a/Coder.Test/Graph/AstGraphTests.cs b/Coder.Test/Graph/AstGraphTests.cs index 90c6062..4e8834c 100644 --- a/Coder.Test/Graph/AstGraphTests.cs +++ b/Coder.Test/Graph/AstGraphTests.cs @@ -5,7 +5,7 @@ namespace ktsu.Coder.Test.Graph; using System.Numerics; using ktsu.Coder.Ast; using ktsu.Coder.Graph; -using ktsu.ImGuiNodeEditor; +using ktsu.ImGui.NodeEditor; using Microsoft.VisualStudio.TestTools.UnitTesting; /// diff --git a/Directory.Packages.props b/Directory.Packages.props index 2ebd623..39d9fe8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,14 +10,14 @@ - + - - - + + + - - + + diff --git a/README.md b/README.md index e49eacf..7baaa2e 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ every target language. ### Visual graph editor `ktsu.Coder.Graph` renders an AST as an editable node graph, built on -[`ktsu.ImGuiNodeEditor`](https://github.com/ktsu-dev/ImGuiApp) with its force-directed layout. +[`ktsu.ImGui.NodeEditor`](https://github.com/ktsu-dev/ImGuiApp) with its force-directed layout. ```csharp AstGraphEditor editor = new(functionDeclaration);