mirror of https://github.com/icsharpcode/ILSpy.git
Browse Source
The document tabs had two parallel hierarchies: the ContentTabPage dockable wrapper, and four unrelated content viewmodels in its object? Content slot -- three TabPageModel subclasses plus OptionsPageModel, which derived from a bare ObservableObject. The wrapper bridged the gap by reflection (reading Title off the runtime type) and the router duck-typed IsStaticContent across two unrelated classes. Collapse the content side under one abstract ContentPageModel base (named to avoid a clash with Avalonia.Controls.ContentPage). OptionsPageModel joins it, dropping its duplicate Title/IsStaticContent. ContentTabPage.Content becomes ContentPageModel?, so title/language-switching read directly and IsWritablePreview collapses from two runtime type-tests to one IsStaticContent check. CreateTab and the dock-router helpers are typed through. Morph-in-place is unchanged -- the One still swaps its Content in place; this only strengthens the types behind it.pull/3755/head
Siegfried Pammer
1 month ago
20 changed files with 143 additions and 55 deletions
@ -0,0 +1,62 @@ |
|||||||
|
// Copyright (c) 2026 AlphaSierraPapa for the SharpDevelop Team
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
|
||||||
|
// software and associated documentation files (the "Software"), to deal in the Software
|
||||||
|
// without restriction, including without limitation the rights to use, copy, modify, merge,
|
||||||
|
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
|
||||||
|
// to whom the Software is furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in all copies or
|
||||||
|
// substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
|
||||||
|
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
||||||
|
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
|
||||||
|
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
||||||
|
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
using AwesomeAssertions; |
||||||
|
|
||||||
|
using ILSpy.ViewModels; |
||||||
|
|
||||||
|
using NUnit.Framework; |
||||||
|
|
||||||
|
namespace ICSharpCode.ILSpy.Tests; |
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Locks the single inner-content hierarchy: every viewmodel that may occupy a
|
||||||
|
/// <see cref="ContentTabPage"/>'s Content slot derives from the one <see cref="ContentPageModel"/>
|
||||||
|
/// base, and <c>ContentTabPage.Content</c> is typed to it (not <c>object</c>). Guards against a
|
||||||
|
/// future content type sneaking back in as a bare ObservableObject or the slot weakening to object.
|
||||||
|
/// </summary>
|
||||||
|
[TestFixture] |
||||||
|
public class ContentPageHierarchyTests |
||||||
|
{ |
||||||
|
[Test] |
||||||
|
public void All_Four_Content_Types_Derive_From_ContentPageModel() |
||||||
|
{ |
||||||
|
typeof(global::ILSpy.TextView.DecompilerTabPageModel).Should().BeAssignableTo<ContentPageModel>(); |
||||||
|
typeof(MetadataTablePageModel).Should().BeAssignableTo<ContentPageModel>(); |
||||||
|
typeof(global::ILSpy.Compare.CompareTabPageModel).Should().BeAssignableTo<ContentPageModel>(); |
||||||
|
typeof(global::ILSpy.Options.OptionsPageModel).Should().BeAssignableTo<ContentPageModel>( |
||||||
|
"OptionsPageModel must join the content hierarchy, not stay a bare ObservableObject"); |
||||||
|
} |
||||||
|
|
||||||
|
[Test] |
||||||
|
public void ContentTabPage_Content_Is_Typed_To_ContentPageModel() |
||||||
|
{ |
||||||
|
typeof(ContentTabPage).GetProperty(nameof(ContentTabPage.Content))!.PropertyType |
||||||
|
.Should().Be(typeof(ContentPageModel), "the Content slot must be strongly typed, not object"); |
||||||
|
} |
||||||
|
|
||||||
|
[Test] |
||||||
|
public void IsStaticContent_Is_A_Single_Inherited_Member() |
||||||
|
{ |
||||||
|
// One IsStaticContent, declared on the base -- not duck-typed across unrelated classes.
|
||||||
|
typeof(ContentPageModel).GetProperty(nameof(ContentPageModel.IsStaticContent)) |
||||||
|
.Should().NotBeNull("IsStaticContent lives on ContentPageModel"); |
||||||
|
typeof(global::ILSpy.Options.OptionsPageModel).GetProperty("IsStaticContent")!.DeclaringType |
||||||
|
.Should().Be(typeof(ContentPageModel), "OptionsPageModel must inherit IsStaticContent, not redeclare it"); |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,39 @@ |
|||||||
|
// Copyright (c) 2026 AlphaSierraPapa for the SharpDevelop Team
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
|
||||||
|
// software and associated documentation files (the "Software"), to deal in the Software
|
||||||
|
// without restriction, including without limitation the rights to use, copy, modify, merge,
|
||||||
|
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
|
||||||
|
// to whom the Software is furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in all copies or
|
||||||
|
// substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
|
||||||
|
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
||||||
|
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
|
||||||
|
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
||||||
|
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
namespace ILSpy.ViewModels |
||||||
|
{ |
||||||
|
/// <summary>
|
||||||
|
/// Base for the concrete viewmodels that occupy a <see cref="ContentTabPage"/>'s
|
||||||
|
/// <see cref="ContentTabPage.Content"/> slot: the decompiler text view, the metadata grid,
|
||||||
|
/// the compare view, and the Options panel. Collapsing them under one base lets
|
||||||
|
/// <c>ContentTabPage</c> type its <c>Content</c> strongly and read <c>Title</c> /
|
||||||
|
/// <c>SupportsLanguageSwitching</c> / <see cref="IsStaticContent"/> directly instead of by
|
||||||
|
/// reflection or runtime type-tests scattered across the dock router.
|
||||||
|
/// </summary>
|
||||||
|
public abstract class ContentPageModel : TabPageModel |
||||||
|
{ |
||||||
|
/// <summary>
|
||||||
|
/// True for content a tree-node selection must NOT replace in the preview tab -- the
|
||||||
|
/// static pages (Options, About, embedded resources). Defaults false (ordinary decompile
|
||||||
|
/// / metadata content); static pages set it true. The dock router's "is this the writable
|
||||||
|
/// preview?" and "what's the current decompile target?" checks key off this.
|
||||||
|
/// </summary>
|
||||||
|
public bool IsStaticContent { get; set; } |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue