Refactor EnvDTE.EditPoint and add tests.

mrward · mrward · commit 23cd5137afb7 · 2014-02-15T15:53:53.000Z
diff --git a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
@@ -89,7 +89,7 @@
     <Compile Include="Src\Design\FakeProjectBuilder.cs" />
     <Compile Include="Src\Design\FakeSelectedProject.cs" />
     <Compile Include="Src\DocumentLoader.cs" />
-    <Compile Include="Src\DomRegionExtensions.cs" />
+    <Compile Include="Src\DocumentView.cs" />
     <Compile Include="Src\EnvDTE\CodeAttribute.cs" />
     <Compile Include="Src\EnvDTE\CodeAttribute2.cs" />
     <Compile Include="Src\EnvDTE\CodeAttributeArgument.cs" />
@@ -151,6 +151,7 @@
     </Compile>
     <Compile Include="Src\FileConflictViewModel.cs" />
     <Compile Include="Src\ICodeGenerator.cs" />
+    <Compile Include="Src\IDocumentView.cs" />
     <Compile Include="Src\IPackageRepositoryFactoryEvents.cs" />
     <Compile Include="Src\IPackageViewModelParent.cs" />
     <Compile Include="Src\IUpdatePackagesAction.cs" />
@@ -161,10 +162,8 @@
     <Compile Include="Src\IUpdatePackageSettings.cs" />
     <Compile Include="Src\IVirtualMethodUpdater.cs" />
     <Compile Include="Src\IProjectBrowserUpdater.cs" />
-    <Compile Include="Src\IRefactoringDocumentView.cs" />
     <Compile Include="Src\IFieldExtensions.cs" />
     <Compile Include="Src\IDocumentLoader.cs" />
-    <Compile Include="Src\IMethodOrPropertyExtensions.cs" />
     <Compile Include="Src\InstalledPackageViewModel.cs" />
     <Compile Include="Src\InstalledPackageViewModelFactory.cs" />
     <Compile Include="Src\IPackageManagementSelectedProject.cs" />
@@ -292,7 +291,6 @@
     <Compile Include="Src\ProjectBrowserUpdater.cs" />
     <Compile Include="Src\ProjectTemplatePackageRepositoryCache.cs" />
     <Compile Include="Src\ProjectTemplatePackagesSettingsFileName.cs" />
-    <Compile Include="Src\RefactoringDocumentView.cs" />
     <Compile Include="Src\RegisteredPackageRepositories.cs" />
     <Compile Include="Src\ManagePackagesView.cs">
       <DependentUpon>ManagePackagesView.xaml</DependentUpon>
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/DocumentLoader.cs b/src/AddIns/Misc/PackageManagement/Project/Src/DocumentLoader.cs
@@ -23,10 +23,10 @@ namespace ICSharpCode.PackageManagement
 {
 	public class DocumentLoader : IDocumentLoader
 	{
-		public IRefactoringDocumentView LoadRefactoringDocumentView(string fileName)
+		public IDocumentView LoadDocumentView(string fileName)
 		{
 			return SD.MainThread.InvokeIfRequired(() => {
-				return new RefactoringDocumentView(fileName);
+				return new DocumentView(fileName);
 			});
 		}
 	}
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/DocumentView.cs b/src/AddIns/Misc/PackageManagement/Project/Src/DocumentView.cs
@@ -23,14 +23,14 @@
 
 namespace ICSharpCode.PackageManagement
 {
-	public class RefactoringDocumentView : IRefactoringDocumentView
+	public class DocumentView : IDocumentView
 	{		
-		public RefactoringDocumentView(string fileName)
+		public DocumentView(string fileName)
 		{
 			View = FileService.OpenFile(fileName);
 			TextEditor = GetTextEditor();
 			FormattingStrategy = TextEditor.Language.FormattingStrategy;
-			RefactoringDocument = LoadDocument();
+			Document = LoadDocument();
 		}
 		
 		IViewContent View { get; set; }
@@ -42,7 +42,7 @@ ITextEditor GetTextEditor()
 			return View.GetService<ITextEditor>();
 		}
 		
-		public IDocument RefactoringDocument { get; private set; }
+		public IDocument Document { get; private set; }
 		
 		IDocument LoadDocument()
 		{
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/DomRegionExtensions.cs b/src/AddIns/Misc/PackageManagement/Project/Src/DomRegionExtensions.cs
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/EditPoint.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/EditPoint.cs
@@ -26,7 +26,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE
 	public class EditPoint : TextPoint, global::EnvDTE.EditPoint
 	{
 		IDocument document;
-		IRefactoringDocumentView documentView;
+		IDocumentView documentView;
 		
 		internal EditPoint(string fileName, TextLocation location, IDocumentLoader documentLoader)
 			: base(fileName, location, documentLoader)
@@ -49,8 +49,8 @@ void ReplaceText(TextPoint endPoint, string text, global::EnvDTE.vsEPReplaceText
 		
 		void OpenDocument()
 		{
-			documentView = documentLoader.LoadRefactoringDocumentView(fileName);
-			document = documentView.RefactoringDocument;
+			documentView = documentLoader.LoadDocumentView(fileName);
+			document = documentView.Document;
 		}
 		
 		int GetStartOffset()
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/TextPoint.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/TextPoint.cs
@@ -19,7 +19,6 @@
 using System;
 using ICSharpCode.NRefactory;
 using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.SharpDevelop.Dom;
 
 namespace ICSharpCode.PackageManagement.EnvDTE
 {
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IDocumentLoader.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IDocumentLoader.cs
@@ -22,6 +22,6 @@ namespace ICSharpCode.PackageManagement
 {
 	public interface IDocumentLoader
 	{
-		IRefactoringDocumentView LoadRefactoringDocumentView(string fileName);
+		IDocumentView LoadDocumentView(string fileName);
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IDocumentView.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IDocumentView.cs
@@ -21,9 +21,9 @@
 
 namespace ICSharpCode.PackageManagement
 {
-	public interface IRefactoringDocumentView
+	public interface IDocumentView
 	{
-		IDocument RefactoringDocument { get; }
+		IDocument Document { get; }
 		void IndentLines(int beginLine, int endLine);
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IMethodOrPropertyExtensions.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IMethodOrPropertyExtensions.cs
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/EditPointTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/EditPointTests.cs

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ namespace ICSharpCode.PackageManagement`
`23`	`23`	`{`
`24`	`24`	`public class DocumentLoader : IDocumentLoader`
`25`	`25`	`{`
`26`		`- public IRefactoringDocumentView LoadRefactoringDocumentView(string fileName)`
	`26`	`+ public IDocumentView LoadDocumentView(string fileName)`
`27`	`27`	`{`
`28`	`28`	`return SD.MainThread.InvokeIfRequired(() => {`
`29`		`- return new RefactoringDocumentView(fileName);`
	`29`	`+ return new DocumentView(fileName);`
`30`	`30`	`});`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@`
`23`	`23`
`24`	`24`	`namespace ICSharpCode.PackageManagement`
`25`	`25`	`{`
`26`		`- public class RefactoringDocumentView : IRefactoringDocumentView`
	`26`	`+ public class DocumentView : IDocumentView`
`27`	`27`	`{`
`28`		`- public RefactoringDocumentView(string fileName)`
	`28`	`+ public DocumentView(string fileName)`
`29`	`29`	`{`
`30`	`30`	`View = FileService.OpenFile(fileName);`
`31`	`31`	`TextEditor = GetTextEditor();`
`32`	`32`	`FormattingStrategy = TextEditor.Language.FormattingStrategy;`
`33`		`- RefactoringDocument = LoadDocument();`
	`33`	`+ Document = LoadDocument();`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`IViewContent View { get; set; }`
`@@ -42,7 +42,7 @@ ITextEditor GetTextEditor()`
`42`	`42`	`return View.GetService<ITextEditor>();`
`43`	`43`	`}`
`44`	`44`
`45`		`- public IDocument RefactoringDocument { get; private set; }`
	`45`	`+ public IDocument Document { get; private set; }`
`46`	`46`
`47`	`47`	`IDocument LoadDocument()`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE`
`26`	`26`	`public class EditPoint : TextPoint, global::EnvDTE.EditPoint`
`27`	`27`	`{`
`28`	`28`	`IDocument document;`
`29`		`- IRefactoringDocumentView documentView;`
	`29`	`+ IDocumentView documentView;`
`30`	`30`
`31`	`31`	`internal EditPoint(string fileName, TextLocation location, IDocumentLoader documentLoader)`
`32`	`32`	`: base(fileName, location, documentLoader)`
`@@ -49,8 +49,8 @@ void ReplaceText(TextPoint endPoint, string text, global::EnvDTE.vsEPReplaceText`
`49`	`49`
`50`	`50`	`void OpenDocument()`
`51`	`51`	`{`
`52`		`- documentView = documentLoader.LoadRefactoringDocumentView(fileName);`
`53`		`- document = documentView.RefactoringDocument;`
	`52`	`+ documentView = documentLoader.LoadDocumentView(fileName);`
	`53`	`+ document = documentView.Document;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`int GetStartOffset()`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`using System;`
`20`	`20`	`using ICSharpCode.NRefactory;`
`21`	`21`	`using ICSharpCode.NRefactory.TypeSystem;`
`22`		`-using ICSharpCode.SharpDevelop.Dom;`
`23`	`22`
`24`	`23`	`namespace ICSharpCode.PackageManagement.EnvDTE`
`25`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ namespace ICSharpCode.PackageManagement`
`22`	`22`	`{`
`23`	`23`	`public interface IDocumentLoader`
`24`	`24`	`{`
`25`		`- IRefactoringDocumentView LoadRefactoringDocumentView(string fileName);`
	`25`	`+ IDocumentView LoadDocumentView(string fileName);`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@`
`21`	`21`
`22`	`22`	`namespace ICSharpCode.PackageManagement`
`23`	`23`	`{`
`24`		`- public interface IRefactoringDocumentView`
	`24`	`+ public interface IDocumentView`
`25`	`25`	`{`
`26`		`- IDocument RefactoringDocument { get; }`
	`26`	`+ IDocument Document { get; }`
`27`	`27`	`void IndentLines(int beginLine, int endLine);`
`28`	`28`	`}`
`29`	`29`	`}`