Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions CSharpCodeAnalyst/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,22 @@ private void StartUi()
var explorer = new CodeGraphExplorer();
var mainWindow = new MainWindow();

var explorationGraphViewer = new GraphViewer(messaging, applicationSettings.WarningCodeElementLimit);
// The shared, render-agnostic model the web view observes and drives.
var graphViewState = new GraphViewState();

// Graph search reads/writes the shared GraphViewState (search highlights live in
// PresentationState, which the web view renders).
var graphSearchViewModel = new GraphSearchViewModel(graphViewState);

var refactoringInteraction = new RefactoringInteraction();
var refactoringService = new RefactoringService(refactoringInteraction, messaging);
mainWindow.SetViewer(explorationGraphViewer, messaging);
mainWindow.SetViewer(graphViewState, messaging, messaging, graphSearchViewModel);

var projectStorage = new JsonProjectStorage();
var projectService = new ProjectService(projectStorage, uiNotification, userSettings);

var viewModel = new MainViewModel(messaging, applicationSettings, userSettings, analyzerManager, refactoringService, projectService);
var graphViewModel = new GraphViewModel(explorationGraphViewer, explorer, messaging, applicationSettings, refactoringService);
var graphViewModel = new GraphViewModel(graphViewState, explorer, messaging, applicationSettings, refactoringService);
var treeViewModel = new TreeViewModel(messaging, refactoringService);
var searchViewModel = new AdvancedSearchViewModel(messaging, refactoringService);
var infoPanelViewModel = new InfoPanelViewModel();
Expand Down
2 changes: 1 addition & 1 deletion CSharpCodeAnalyst/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
// app, or any theme specific resource dictionaries)
)]

// Allow test project to access internal types for unit testing (e.g., MsaglHierarchicalBuilder)
// Allow test project to access internal types for unit testing
[assembly: InternalsVisibleTo("Tests")]
19 changes: 8 additions & 11 deletions CSharpCodeAnalyst/CSharpCodeAnalyst.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -142,25 +142,22 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.142" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4022.49" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CodeParser\CodeParser.csproj" />
<ProjectReference Include="..\CodeGraph\CodeGraph.csproj" />
<!-- Web Graph View assets, served offline by WebView2 from the output directory. -->
<Content Include="Features\WebGraph\Web\**\*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<Reference Include="Microsoft.Msagl">
<HintPath>..\ReferencedAssemblies\Microsoft.Msagl.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Msagl.Drawing">
<HintPath>..\ReferencedAssemblies\Microsoft.Msagl.Drawing.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Msagl.WpfGraphControl">
<HintPath>..\ReferencedAssemblies\Microsoft.Msagl.WpfGraphControl.dll</HintPath>
</Reference>
<ProjectReference Include="..\CodeParser\CodeParser.csproj" />
<ProjectReference Include="..\CodeGraph\CodeGraph.csproj" />
</ItemGroup>


<ItemGroup>
<Compile Update="Resources\Strings.Designer.cs">
<DesignTime>True</DesignTime>
Expand Down
3 changes: 1 addition & 2 deletions CSharpCodeAnalyst/Features/Export/Exporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ public Exporter(IUserNotification ui)
}

/// <summary>
/// Svg export is special because it is a feature of the
/// Msagl graph library.
/// Old Svg export is with customizable export function.
/// </summary>
public void ToSvg(Action<FileStream>? svgExport)
{
Expand Down
155 changes: 0 additions & 155 deletions CSharpCodeAnalyst/Features/Graph/ClickController.cs

This file was deleted.

121 changes: 0 additions & 121 deletions CSharpCodeAnalyst/Features/Graph/CodeExplorerControl.xaml

This file was deleted.

36 changes: 0 additions & 36 deletions CSharpCodeAnalyst/Features/Graph/CodeExplorerControl.xaml.cs

This file was deleted.

Loading