diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2011-10-06 12:21:35 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2011-10-06 12:21:35 +0400 |
commit | 7f5955eea0ab6c8a14c0b5d73eacd5cbc3aeec26 (patch) | |
tree | c562d4b456751e1586a16dd5502ad98a93e05e68 /main/src/addins/MonoDevelop.Refactoring | |
parent | c7054c3b0cbd148e15b7d36990661c4ae02247d0 (diff) |
Fixed build.
Diffstat (limited to 'main/src/addins/MonoDevelop.Refactoring')
4 files changed, 6 insertions, 5 deletions
diff --git a/main/src/addins/MonoDevelop.Refactoring/Makefile.am b/main/src/addins/MonoDevelop.Refactoring/Makefile.am index 7919f47724..59e0eeb09a 100644 --- a/main/src/addins/MonoDevelop.Refactoring/Makefile.am +++ b/main/src/addins/MonoDevelop.Refactoring/Makefile.am @@ -5,6 +5,7 @@ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Refactoring.dll DEPS = \ $(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \ $(top_builddir)/build/AddIns/MonoDevelop.SourceEditor2.dll \ + $(top_builddir)/build/bin/ICSharpCode.NRefactory.CSharp.dll \ $(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \ $(top_builddir)/build/bin/Mono.TextEditor.dll \ $(top_builddir)/build/bin/MonoDevelop.Core.dll \ @@ -14,7 +15,6 @@ REFS = \ $(GLIB_SHARP_LIBS) \ $(GTK_SHARP_LIBS) \ $(MONO_ADDINS_LIBS) \ - -r:../../../contrib/ICSharpCode.NRefactory/bin/Debug/ICSharpCode.NRefactory.CSharp.dll \ -r:Mono.Cairo \ -r:Mono.Posix \ -r:System \ diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index f82e798a10..8bb9b4cd7b 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -174,6 +174,7 @@ <ProjectReference Include="..\..\..\contrib\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj"> <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project> <Name>ICSharpCode.NRefactory.CSharp</Name> + <Private>False</Private> </ProjectReference> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs index 04a3c81879..33a563c992 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs @@ -90,7 +90,7 @@ namespace MonoDevelop.Refactoring ResolveResult resolveResult; var item = CurrentRefactoryOperationsHandler.GetItem (ctx, doc, out resolveResult); - IMember eitem = resolveResult != null ? (resolveResult.CallingMember ?? resolveResult.CallingType) : null; +/* IMember eitem = resolveResult != null ? (resolveResult.CallingMember ?? resolveResult.CallingType) : null; string itemName = null; if (item is IMember) itemName = ((IMember)item).FullName; @@ -100,7 +100,7 @@ namespace MonoDevelop.Refactoring } ITypeDefinition eclass = null; if (item is ITypeDefinition) { - if (((ITypeDefinition)item).ClassType == ClassType.Interface) + if (((ITypeDefinition)item).Kind == TypeKind.Interface) eclass = CurrentRefactoryOperationsHandler.FindEnclosingClass (ctx, editor.Name, line, column); else eclass = (IType)item; if (eitem is IMethod && ((IMethod)eitem).IsConstructor && eitem.DeclaringType.Equals (item)) { @@ -108,7 +108,7 @@ namespace MonoDevelop.Refactoring eitem = null; } } - + */ // // IMember eitem = resolveResult != null ? (resolveResult.CallingMember ?? resolveResult.CallingType) : null; // string itemName = null; diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs index 56da561e2d..1a7820ee0b 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs @@ -107,7 +107,7 @@ namespace MonoDevelop.Refactoring // formatter.Indentation = indentLevel; stringWriter.NewLine = Document.Editor.EolMarker; - var visitor = new OutputVisitor (formatter, new CSharpFormattingOptions ()); + var visitor = new CSharpOutputVisitor (formatter, new CSharpFormattingOptions ()); node.AcceptVisitor (visitor, null); return stringWriter.ToString (); } |