dotnet
/
razor-tooling
зеркало из https://github.com/dotnet/razor.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Move legacy BraceSmartIndenter to LegacyEditor project

This commit is contained in:
Dustin Campbell 2024-02-01 12:31:08 -08:00
Родитель c8a101d88e
Коммит f1fe607ce6
7 изменённых файлов: 106 добавлений и 76 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
SpellingExclusions.dic
Просмотреть файл

@ -3,3 +3,4 @@ Blazor
csproj
cshtml
microsoft
Metacode

5
src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs → src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/BraceSmartIndenter.cs
Просмотреть файл

@ -8,13 +8,14 @@ using System.Text;
using Microsoft.AspNetCore.Razor.Language;
using Microsoft.AspNetCore.Razor.Language.Legacy;
using Microsoft.AspNetCore.Razor.Language.Syntax;
using Microsoft.VisualStudio.Editor.Razor;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Text.Operations;
using Microsoft.VisualStudio.Threading;
using ITextBuffer = Microsoft.VisualStudio.Text.ITextBuffer;
namespace Microsoft.VisualStudio.Editor.Razor;
namespace Microsoft.VisualStudio.LegacyEditor.Razor;
/// <summary>
/// This class is responsible for handling situations where Roslyn and the HTML editor cannot auto-indent Razor code.
@ -79,7 +80,7 @@ internal class BraceSmartIndenter : IDisposable
}
// Internal for testing
internal void TextBuffer_OnChanged(object sender, TextContentChangedEventArgs args)
internal void TextBuffer_OnChanged(object? sender, TextContentChangedEventArgs args)
{
_joinableTaskContext.AssertUIThread();

3
src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenterFactory.cs → src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/BraceSmartIndenterFactory.cs
Просмотреть файл

@ -2,10 +2,11 @@
// Licensed under the MIT license. See License.txt in the project root for license information.
using System.ComponentModel.Composition;
using Microsoft.VisualStudio.Editor.Razor;
using Microsoft.VisualStudio.Text.Operations;
using Microsoft.VisualStudio.Threading;
namespace Microsoft.VisualStudio.Editor.Razor;
namespace Microsoft.VisualStudio.LegacyEditor.Razor;
[Export(typeof(IBraceSmartIndenterFactory))]
[method: ImportingConstructor]

4
src/Razor/src/Microsoft.VisualStudio.Editor.Razor/IBraceSmartIndenterFactory.cs → src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/IBraceSmartIndenterFactory.cs
Просмотреть файл

@ -1,7 +1,9 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the MIT license. See License.txt in the project root for license information.
namespace Microsoft.VisualStudio.Editor.Razor;
using Microsoft.VisualStudio.Editor.Razor;
namespace Microsoft.VisualStudio.LegacyEditor.Razor;
internal interface IBraceSmartIndenterFactory
{

35
src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterIntegrationTest.cs → src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/BraceSmartIndenterIntegrationTest.cs
Просмотреть файл

@ -1,19 +1,18 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the MIT license. See License.txt in the project root for license information.
#nullable disable
using System;
using Microsoft.AspNetCore.Razor;
using Microsoft.AspNetCore.Razor.Test.Common.Editor;
using Xunit;
using Xunit.Abstractions;
namespace Microsoft.VisualStudio.Editor.Razor;
namespace Microsoft.VisualStudio.LegacyEditor.Razor.Test;
public class BraceSmartIndenterIntegrationTest(ITestOutputHelper testOutput) : BraceSmartIndenterTestBase(testOutput)
{
[UIFact]
public void TextBuffer_OnPostChanged_IndentsInbetweenBraces_BaseIndentation()
public void TextBuffer_OnPostChanged_IndentIsInBetweenBraces_BaseIndentation()
{
// Arrange
var change = Environment.NewLine;
@ -23,9 +22,9 @@ public class BraceSmartIndenterIntegrationTest(ITestOutputHelper testOutput) : B
var expectedIndentResult = "@{ " + change + change + "}";
var caret = CreateCaretFrom(3 + change.Length, afterChangeSnapshot);
TestTextBuffer textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer, caret);
var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
TestTextBuffer? textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer.AssumeNotNull(), caret);
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), focusedTextView);
textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
var editorOperationsFactory = CreateOperationsFactoryService();
using var braceSmartIndenter = new BraceSmartIndenter(documentTracker, editorOperationsFactory, JoinableTaskFactory.Context);
@ -38,7 +37,7 @@ public class BraceSmartIndenterIntegrationTest(ITestOutputHelper testOutput) : B
}
[UIFact]
public void TextBuffer_OnPostChanged_IndentsInbetweenBraces_OneLevelOfIndentation()
public void TextBuffer_OnPostChanged_IndentIsInBetweenBraces_OneLevelOfIndentation()
{
// Arrange
var change = "\r";
@ -48,9 +47,9 @@ public class BraceSmartIndenterIntegrationTest(ITestOutputHelper testOutput) : B
var expectedIndentResult = " @{ " + change + change + " }";
var caret = CreateCaretFrom(7 + change.Length, afterChangeSnapshot);
TestTextBuffer textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer, caret);
var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
TestTextBuffer? textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer.AssumeNotNull(), caret);
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), focusedTextView);
textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
var editorOperationsFactory = CreateOperationsFactoryService();
using var braceSmartIndenter = new BraceSmartIndenter(documentTracker, editorOperationsFactory, JoinableTaskFactory.Context);
@ -63,7 +62,7 @@ public class BraceSmartIndenterIntegrationTest(ITestOutputHelper testOutput) : B
}
[UIFact]
public void TextBuffer_OnPostChanged_IndentsInbetweenDirectiveBlockBraces()
public void TextBuffer_OnPostChanged_IndentIsInBetweenDirectiveBlockBraces()
{
// Arrange
var change = Environment.NewLine;
@ -73,9 +72,9 @@ public class BraceSmartIndenterIntegrationTest(ITestOutputHelper testOutput) : B
var expectedIndentResult = " @functions {" + change + change + " }";
var caret = CreateCaretFrom(16 + change.Length, afterChangeSnapshot);
TestTextBuffer textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer, caret);
var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
TestTextBuffer? textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer.AssumeNotNull(), caret);
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), focusedTextView);
textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
var editorOperationsFactory = CreateOperationsFactoryService();
using var braceSmartIndenter = new BraceSmartIndenter(documentTracker, editorOperationsFactory, JoinableTaskFactory.Context);
@ -97,9 +96,9 @@ public class BraceSmartIndenterIntegrationTest(ITestOutputHelper testOutput) : B
var edit = new TestEdit(28, 0, initialSnapshot, afterChangeSnapshot, change);
var caret = CreateCaretFrom(28 + change.Length, afterChangeSnapshot);
TestTextBuffer textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer, caret);
var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
TestTextBuffer? textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer.AssumeNotNull(), caret);
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), focusedTextView);
textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
var editorOperationsFactory = CreateOperationsFactoryService();
using var braceSmartIndenter = new BraceSmartIndenter(documentTracker, editorOperationsFactory, JoinableTaskFactory.Context);

123
src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTest.cs → src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/BraceSmartIndenterTest.cs
Просмотреть файл

@ -1,14 +1,15 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the MIT license. See License.txt in the project root for license information.
#nullable disable
using System;
using System.Collections;
using System.Collections.Generic;
using Microsoft.AspNetCore.Razor;
using Microsoft.AspNetCore.Razor.Language;
using Microsoft.AspNetCore.Razor.Language.Extensions;
using Microsoft.AspNetCore.Razor.Language.Legacy;
using Microsoft.AspNetCore.Razor.Language.Syntax;
using Microsoft.AspNetCore.Razor.Test.Common;
using Microsoft.AspNetCore.Razor.Test.Common.Editor;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
@ -18,16 +19,11 @@ using Xunit;
using Xunit.Abstractions;
using ITextBuffer = Microsoft.VisualStudio.Text.ITextBuffer;
namespace Microsoft.VisualStudio.Editor.Razor;
namespace Microsoft.VisualStudio.LegacyEditor.Razor.Test;
public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
public class BraceSmartIndenterTest(ITestOutputHelper testOutput) : BraceSmartIndenterTestBase(testOutput)
{
private static readonly RazorParserOptions DefaultOptions = RazorParserOptions.Create(builder => builder.EnableSpanEditHandlers = true);
public BraceSmartIndenterTest(ITestOutputHelper testOutput)
: base(testOutput)
{
}
private static readonly RazorParserOptions s_defaultOptions = RazorParserOptions.Create(builder => builder.EnableSpanEditHandlers = true);
[Fact]
public void AtApplicableRazorBlock_NestedIfBlock_ReturnsFalse()
@ -89,6 +85,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
@{
}
""");
Assert.NotNull(span);
// Act
var result = BraceSmartIndenter.ContainsInvalidContent(span);
@ -102,6 +99,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
{
// Arrange
var span = ExtractSpan(2, "@{ }");
Assert.NotNull(span);
// Act
var result = BraceSmartIndenter.ContainsInvalidContent(span);
@ -115,6 +113,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
{
// Arrange
var span = ExtractSpan(3, "@{}");
Assert.NotNull(span);
// Act
var result = BraceSmartIndenter.ContainsInvalidContent(span);
@ -128,6 +127,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
{
// Arrange
var span = ExtractSpan(2, "@{ if}");
Assert.NotNull(span);
// Act
var result = BraceSmartIndenter.ContainsInvalidContent(span);
@ -166,7 +166,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
public void IsUnlinkedSpan_NullOwner_ReturnsTrue()
{
// Arrange
SyntaxNode owner = null;
SyntaxNode? owner = null;
// Act
var result = BraceSmartIndenter.IsUnlinkedSpan(owner);
@ -180,6 +180,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
{
// Arrange
var span = ExtractSpan(2, "@{}");
Assert.NotNull(span);
// Act
var result = BraceSmartIndenter.SurroundedByInvalidContent(span);
@ -193,6 +194,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
{
// Arrange
var span = ExtractSpan(9, "@{<p></p>}");
Assert.NotNull(span);
// Act
var result = BraceSmartIndenter.SurroundedByInvalidContent(span);
@ -206,6 +208,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
{
// Arrange
var span = ExtractSpan(2, "@{<p>");
Assert.NotNull(span);
// Act
var result = BraceSmartIndenter.SurroundedByInvalidContent(span);
@ -218,7 +221,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
public void AtApplicableRazorBlock_AtMarkup_ReturnsFalse()
{
// Arrange
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("<p></p>"), DefaultOptions);
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("<p></p>"), s_defaultOptions);
var changePosition = 2;
// Act
@ -232,7 +235,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
public void AtApplicableRazorBlock_AtExplicitCodeBlocksCode_ReturnsTrue()
{
// Arrange
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("@{}"), DefaultOptions);
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("@{}"), s_defaultOptions);
var changePosition = 2;
// Act
@ -265,7 +268,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
public void AtApplicableRazorBlock_WhenNoOwner_ReturnsFalse()
{
// Arrange
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("@DateTime.Now"), DefaultOptions);
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create("@DateTime.Now"), s_defaultOptions);
var changePosition = 14; // 1 after the end of the content
// Act
@ -281,9 +284,9 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
// Arrange
var initialSnapshot = new StringTextSnapshot("@{ \n}");
var expectedIndentResult = "@{ anything\n}";
ITextBuffer textBuffer = null;
var textView = CreateFocusedTextView(() => textBuffer);
var documentTracker = CreateDocumentTracker(() => textBuffer, textView);
ITextBuffer? textBuffer = null;
var textView = CreateFocusedTextView(() => textBuffer.AssumeNotNull());
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), textView);
textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
// Act
@ -299,16 +302,17 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
// Arrange
var initialSnapshot = new StringTextSnapshot("@{ \n\n}");
var bufferPosition = new VirtualSnapshotPoint(initialSnapshot, 4);
var caret = new Mock<ITextCaret>(MockBehavior.Strict);
caret.Setup(c => c.MoveTo(It.IsAny<SnapshotPoint>()))
var caret = new StrictMock<ITextCaret>();
caret
.Setup(c => c.MoveTo(It.IsAny<SnapshotPoint>()))
.Callback<SnapshotPoint>(point =>
{
Assert.Equal(3, point.Position);
Assert.Same(initialSnapshot, point.Snapshot);
}).Returns(new CaretPosition(bufferPosition, new Mock<IMappingPoint>(MockBehavior.Strict).Object, PositionAffinity.Predecessor));
ITextBuffer textBuffer = null;
var textView = CreateFocusedTextView(() => textBuffer, caret.Object);
var documentTracker = CreateDocumentTracker(() => textBuffer, textView);
}).Returns(new CaretPosition(bufferPosition, StrictMock.Of<IMappingPoint>(), PositionAffinity.Predecessor));
ITextBuffer? textBuffer = null;
var textView = CreateFocusedTextView(() => textBuffer.AssumeNotNull(), caret.Object);
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), textView);
textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
// Act
@ -414,7 +418,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
// Arrange
var initialSnapshot = new StringTextSnapshot("Hello World");
var textBuffer = new TestTextBuffer(initialSnapshot);
textBuffer.ChangeContentType(new LegacyCoreContentType(), editTag: null);
textBuffer.ChangeContentType(VsMocks.ContentTypes.LegacyRazorCore, editTag: null);
var edit = new TestEdit(0, 0, initialSnapshot, initialSnapshot, string.Empty);
var editorOperationsFactory = new Mock<IEditorOperationsFactoryService>(MockBehavior.Strict);
var documentTracker = CreateDocumentTracker(() => textBuffer, Mock.Of<ITextView>(MockBehavior.Strict));
@ -433,8 +437,8 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
Hello World
""");
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(snapshot.Content));
ITextBuffer textBuffer = null;
var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView: null);
ITextBuffer? textBuffer = null;
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), focusedTextView: null);
textBuffer = CreateTextBuffer(snapshot, documentTracker);
// Act
@ -451,9 +455,9 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
// Arrange
var snapshot = new StringTextSnapshot("This Hello World");
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(snapshot.Content));
ITextBuffer textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer);
var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
ITextBuffer? textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer.AssumeNotNull());
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), focusedTextView);
textBuffer = CreateTextBuffer(snapshot, documentTracker);
// Act
@ -473,9 +477,9 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
Hello World
""");
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(initialSnapshot.Content));
ITextBuffer textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer);
var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
ITextBuffer? textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer.AssumeNotNull());
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), focusedTextView);
textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
// Act
@ -492,9 +496,9 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
// Arrange
var initialSnapshot = new StringTextSnapshot("Hello\u0085World");
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(initialSnapshot.Content));
ITextBuffer textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer);
var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
ITextBuffer? textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer.AssumeNotNull());
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), focusedTextView);
textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
// Act
@ -514,9 +518,9 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
World
""");
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(initialSnapshot.Content));
ITextBuffer textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer);
var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
ITextBuffer? textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer.AssumeNotNull());
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), focusedTextView);
textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
// Act
@ -533,9 +537,9 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
// Arrange
var initialSnapshot = new StringTextSnapshot("@{ \n}");
var syntaxTree = RazorSyntaxTree.Parse(TestRazorSourceDocument.Create(initialSnapshot.Content));
ITextBuffer textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer);
var documentTracker = CreateDocumentTracker(() => textBuffer, focusedTextView);
ITextBuffer? textBuffer = null;
var focusedTextView = CreateFocusedTextView(() => textBuffer.AssumeNotNull());
var documentTracker = CreateDocumentTracker(() => textBuffer.AssumeNotNull(), focusedTextView);
textBuffer = CreateTextBuffer(initialSnapshot, documentTracker);
// Act
@ -562,7 +566,7 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
return syntaxTree;
}
private static SyntaxNode ExtractSpan(int spanLocation, string content)
private static SyntaxNode? ExtractSpan(int spanLocation, string content)
{
var syntaxTree = GetSyntaxTree(content);
#pragma warning disable CS0618 // Type or member is obsolete
@ -571,13 +575,13 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
return span;
}
protected class TestTextContentChangedEventArgs : TextContentChangedEventArgs
protected class TestTextContentChangedEventArgs(INormalizedTextChangeCollection changeCollection)
: TextContentChangedEventArgs(
CreateBeforeSnapshot(changeCollection),
StrictMock.Of<ITextSnapshot>(),
EditOptions.DefaultMinimalChange,
null)
{
public TestTextContentChangedEventArgs(INormalizedTextChangeCollection changeCollection)
: base(CreateBeforeSnapshot(changeCollection), new Mock<ITextSnapshot>(MockBehavior.Strict).Object, EditOptions.DefaultMinimalChange, null)
{
}
protected static ITextSnapshot CreateBeforeSnapshot(INormalizedTextChangeCollection collection)
{
var version = new Mock<ITextVersion>(MockBehavior.Strict);
@ -591,8 +595,29 @@ public class BraceSmartIndenterTest : BraceSmartIndenterTestBase
}
}
protected class TestTextChangeCollection : List<ITextChange>, INormalizedTextChangeCollection
protected class TestTextChangeCollection : INormalizedTextChangeCollection
{
private readonly List<ITextChange> _changes = [];
public ITextChange this[int index]
{
get => _changes[index];
set => _changes[index] = value;
}
public bool IncludesLineChanges => throw new NotImplementedException();
public int Count => _changes.Count;
public bool IsReadOnly => throw new NotImplementedException();
public void Add(ITextChange item) => throw new NotImplementedException();
public void Clear() => throw new NotImplementedException();
public bool Contains(ITextChange item) => throw new NotImplementedException();
public void CopyTo(ITextChange[] array, int arrayIndex) => throw new NotImplementedException();
public IEnumerator<ITextChange> GetEnumerator() => throw new NotImplementedException();
public int IndexOf(ITextChange item) => throw new NotImplementedException();
public void Insert(int index, ITextChange item) => throw new NotImplementedException();
public bool Remove(ITextChange item) => throw new NotImplementedException();
public void RemoveAt(int index) => throw new NotImplementedException();
IEnumerator IEnumerable.GetEnumerator() => throw new NotImplementedException();
}
}

11
src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTestBase.cs → src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/BraceSmartIndenterTestBase.cs
Просмотреть файл

@ -5,17 +5,18 @@ using System;
using Microsoft.AspNetCore.Razor.Language;
using Microsoft.AspNetCore.Razor.Language.Extensions;
using Microsoft.AspNetCore.Razor.Test.Common.Editor;
using Microsoft.VisualStudio.Editor.Razor;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Text.Operations;
using Moq;
using Xunit.Abstractions;
namespace Microsoft.VisualStudio.Editor.Razor;
namespace Microsoft.VisualStudio.LegacyEditor.Razor.Test;
public partial class BraceSmartIndenterTestBase(ITestOutputHelper testOutput) : ProjectSnapshotManagerDispatcherTestBase(testOutput)
public class BraceSmartIndenterTestBase(ITestOutputHelper testOutput) : ProjectSnapshotManagerDispatcherTestBase(testOutput)
{
private protected static IVisualStudioDocumentTracker CreateDocumentTracker(Func<ITextBuffer> bufferAccessor, ITextView focusedTextView)
private protected static IVisualStudioDocumentTracker CreateDocumentTracker(Func<ITextBuffer> bufferAccessor, ITextView? focusedTextView)
{
var tracker = new Mock<IVisualStudioDocumentTracker>(MockBehavior.Strict);
tracker.Setup(t => t.TextBuffer)
@ -72,7 +73,7 @@ public partial class BraceSmartIndenterTestBase(ITestOutputHelper testOutput) :
private protected static TestTextBuffer CreateTextBuffer(StringTextSnapshot initialSnapshot, IVisualStudioDocumentTracker documentTracker)
{
var textBuffer = new TestTextBuffer(initialSnapshot, new LegacyCoreContentType());
var textBuffer = new TestTextBuffer(initialSnapshot, VsMocks.ContentTypes.LegacyRazorCore);
textBuffer.Properties.AddProperty(typeof(IVisualStudioDocumentTracker), documentTracker);
var content = initialSnapshot.Content;
@ -99,7 +100,7 @@ public partial class BraceSmartIndenterTestBase(ITestOutputHelper testOutput) :
protected static ITextBuffer SetupTextBufferMock()
{
var mock = new Mock<ITextBuffer>(MockBehavior.Strict);
mock.SetupGet(a => a.ContentType).Returns(new LegacyCoreContentType());
mock.SetupGet(a => a.ContentType).Returns(VsMocks.ContentTypes.LegacyRazorCore);
return mock.Object;
}
}