diff options
Diffstat (limited to 'main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs')
| -rw-r--r-- | main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs | 1367 |
1 files changed, 657 insertions, 710 deletions
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs index 5f6cd6b4f5..6a2f2bdbc7 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs @@ -1,5 +1,5 @@ // -// CSharpCodecs +// CSharpCodeGenerator.cs // // Author: // Mike Krüger <mkrueger@novell.com> @@ -23,358 +23,405 @@ // 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 System; -using ICSharpCode.NRefactory.CSharp; -using System.Text; -using MonoDevelop.CSharp.Formatting; -using System.Collections.Generic; using System.Linq; -using MonoDevelop.Ide; -using ICSharpCode.NRefactory.TypeSystem; using MonoDevelop.Ide.TypeSystem; -using ICSharpCode.NRefactory.CSharp.Resolver; -using ICSharpCode.NRefactory; -using Mono.TextEditor; -using ICSharpCode.NRefactory.CSharp.TypeSystem; -using MonoDevelop.Projects.Policies; -using Mono.Cecil; -using Mono.Cecil.Cil; -using ICSharpCode.Decompiler; -using ICSharpCode.Decompiler.Ast; -using ICSharpCode.NRefactory.PatternMatching; -using ICSharpCode.NRefactory.TypeSystem.Implementation; - +using Microsoft.CodeAnalysis; +using System.Text; +using MonoDevelop.Ide.Editor; +using MonoDevelop.Ide; +using System.Collections.Generic; +using MonoDevelop.CSharp.Formatting; +using Microsoft.CodeAnalysis.Options; namespace MonoDevelop.CSharp.Refactoring { - class CSharpCodeGenerator : CodeGenerator + class CSharpCodeGenerator // : CodeGenerator { - static CSharpAmbience ambience = new CSharpAmbience (); - - CSharpFormattingPolicy policy; - - public MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy Policy { - get { - if (policy == null) { - var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType); - if (PolicyParent != null) - policy = PolicyParent.Get<CSharpFormattingPolicy> (types); - if (policy == null) { - - policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types); - } - } - return this.policy; - } - } - - public override PolicyContainer PolicyParent { - get { - return base.PolicyParent; - } - set { - base.PolicyParent = value; - var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType); - policy = value.Get<CSharpFormattingPolicy> (types); - } - } - - +// static CSharpAmbience ambience = new CSharpAmbience (); +// +// CSharpFormattingPolicy policy; +// +// public MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy Policy { +// get { +// if (policy == null) { +// var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType); +// if (PolicyParent != null) +// policy = PolicyParent.Get<CSharpFormattingPolicy> (types); +// if (policy == null) { +// +// policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types); +// } +// } +// return this.policy; +// } +// } +// +// public override PolicyContainer PolicyParent { +// get { +// return base.PolicyParent; +// } +// set { +// base.PolicyParent = value; +// var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType); +// policy = value.Get<CSharpFormattingPolicy> (types); +// } +// } +// +// class CodeGenerationOptions { public bool ExplicitDeclaration { get; set; } - public ITypeDefinition ImplementingType { get; set; } - public IUnresolvedTypeDefinition Part { get; set; } + public ITypeSymbol ImplementingType { get; set; } + public Location Part { get; set; } + + public TextEditor Editor { get; set; } + public DocumentContext DocumentContext { get; set; } - public MonoDevelop.Ide.Gui.Document Document { get; set; } + public bool CreateProtocolMember { get; set; } + + public SemanticModel SemanticModel { + get { + var model = DocumentContext.ParsedDocument.GetAst<SemanticModel> (); + return model; + } + } public string GetShortType (string ns, string name, int typeArguments = 0) { - if (Document == null || Document.ParsedDocument == null) + if (DocumentContext == null || Editor == null || SemanticModel == null || DocumentContext.ParsedDocument == null) return ns + "." + name; - var typeDef = new GetClassTypeReference (ns, name, typeArguments).Resolve (Document.Compilation.TypeResolveContext); - if (typeDef == null) + + var model = DocumentContext.ParsedDocument.GetAst<SemanticModel> (); + + if (model == null) return ns + "." + name; - var file = Document.ParsedDocument.ParsedFile as CSharpUnresolvedFile; - var csResolver = file.GetResolver (Document.Compilation, Document.Editor.Caret.Location); - var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver); - return OutputNode (Document, builder.ConvertType (typeDef)); + + var type = model.Compilation.GetTypeByMetadataName (ns + "." + name); + if (type == null) + return ns + "." + name; + + + return type.ToMinimalDisplayString (model, Editor.CaretOffset); } } - - public override string WrapInRegions (string regionName, string text) + + static void AppendLine (StringBuilder sb) { - StringBuilder result = new StringBuilder (); - AppendIndent (result); - result.Append ("#region "); - result.Append (regionName); - AppendLine (result); - result.Append (text); - AppendLine (result); - AppendIndent (result); - result.Append ("#endregion"); - return result.ToString (); + sb.AppendLine (); } - void AppendObsoleteAttribute (StringBuilder result, CodeGenerationOptions options, IEntity entity) - { - string reason; - if (!entity.IsObsolete (out reason)) - return; +// public override string WrapInRegions (string regionName, string text) +// { +// StringBuilder result = new StringBuilder (); +// AppendIndent (result); +// result.Append ("#region "); +// result.Append (regionName); +// AppendLine (result); +// result.Append (text); +// AppendLine (result); +// AppendIndent (result); +// result.Append ("#endregion"); +// return result.ToString (); +// } - var implementingType = options.Part; - var loc = implementingType.Region.End; - - var pf = implementingType.UnresolvedFile; - var file = pf as CSharpUnresolvedFile; + static void AppendObsoleteAttribute (StringBuilder result, CodeGenerationOptions options, ISymbol entity) + { + // TODO: Roslyn port +// string reason; +// if (!entity.IsObsolete (out reason)) +// return; +// +// var implementingType = options.Part; +// var loc = implementingType.Region.End; +// +// var pf = implementingType.UnresolvedFile; +// var file = pf as CSharpUnresolvedFile; +// +// result.Append ("["); +// var obsoleteRef = ReflectionHelper.ParseReflectionName ("System.ObsoleteAttribute"); +// var resolvedType = obsoleteRef.Resolve (options.ImplementingType.Compilation); +// var shortType = resolvedType.Kind != TypeKind.Unknown ? CreateShortType (options.ImplementingType.Compilation, file, loc, resolvedType) : null; +// var text = shortType != null ? shortType.ToString () : "System.Obsolete"; +// if (text.EndsWith ("Attribute", StringComparison.Ordinal)) +// text = text.Substring (0, text.Length - "Attribute".Length); +// result.Append (text); +// if (!string.IsNullOrEmpty (reason)) { +// result.Append (" (\""); +// result.Append (reason); +// result.Append ("\")"); +// } +// result.Append ("]"); +// result.AppendLine (); + } +// +// public override CodeGeneratorMemberResult CreateMemberImplementation (ITypeDefinition implementingType, +// IUnresolvedTypeDefinition part, +// IUnresolvedMember member, +// bool explicitDeclaration) +// { +// SetIndentTo (part); +// var options = new CodeGenerationOptions () { +// ExplicitDeclaration = explicitDeclaration, +// ImplementingType = implementingType, +// Part = part +// }; +// ITypeResolveContext ctx; +// +// var doc = IdeApp.Workbench.GetDocument (part.Region.FileName); +// ctx = new CSharpTypeResolveContext (implementingType.Compilation.MainAssembly, null, implementingType, null); +// options.Document = doc; +// +// if (member is IUnresolvedMethod) +// return GenerateCode ((IMethod) ((IUnresolvedMethod)member).CreateResolved (ctx), options); +// if (member is IUnresolvedProperty) +// return GenerateCode ((IProperty) ((IUnresolvedProperty)member).CreateResolved (ctx), options); +// if (member is IUnresolvedField) +// return GenerateCode ((IField) ((IUnresolvedField)member).CreateResolved (ctx), options); +// if (member is IUnresolvedEvent) +// return GenerateCode ((IEvent) ((IUnresolvedEvent)member).CreateResolved (ctx), options); +// throw new NotSupportedException ("member " + member + " is not supported."); +// } + + public static CodeGeneratorMemberResult CreateOverridenMemberImplementation (DocumentContext document, TextEditor editor, ITypeSymbol implementingType, Location part, ISymbol member, bool explicitDeclaration) + { + var options = new CodeGenerationOptions { + ExplicitDeclaration = explicitDeclaration, + ImplementingType = implementingType, + Part = part, + DocumentContext = document, + Editor = editor + }; - result.Append ("["); - var obsoleteRef = ReflectionHelper.ParseReflectionName ("System.ObsoleteAttribute"); - var resolvedType = obsoleteRef.Resolve (options.ImplementingType.Compilation); - var shortType = resolvedType.Kind != TypeKind.Unknown ? CreateShortType (options.ImplementingType.Compilation, file, loc, resolvedType) : null; - var text = shortType != null ? shortType.ToString () : "System.Obsolete"; - if (text.EndsWith ("Attribute", StringComparison.Ordinal)) - text = text.Substring (0, text.Length - "Attribute".Length); - result.Append (text); - if (!string.IsNullOrEmpty (reason)) { - result.Append (" (\""); - result.Append (reason); - result.Append ("\")"); - } - result.Append ("]"); - result.AppendLine (); + if (member is IMethodSymbol) + return GenerateCode ((IMethodSymbol)member, options); + if (member is IPropertySymbol) + return GenerateCode ((IPropertySymbol)member, options); + if (member is IFieldSymbol) + return GenerateCode ((IFieldSymbol)member, options); + if (member is IEventSymbol) + return GenerateCode ((IEventSymbol)member, options); + throw new NotSupportedException ("member " + member + " is not supported."); } - - public override CodeGeneratorMemberResult CreateMemberImplementation (ITypeDefinition implementingType, - IUnresolvedTypeDefinition part, - IUnresolvedMember member, - bool explicitDeclaration) + + public static CodeGeneratorMemberResult CreateProtocolMemberImplementation (DocumentContext document, TextEditor editor, ITypeSymbol implementingType, Location part, ISymbol member, bool explicitDeclaration) { - SetIndentTo (part); - var options = new CodeGenerationOptions () { + // SetIndentTo (part); + var options = new CodeGenerationOptions { ExplicitDeclaration = explicitDeclaration, ImplementingType = implementingType, - Part = part + Part = part, + DocumentContext = document, + Editor = editor, + CreateProtocolMember = true }; - ITypeResolveContext ctx; - - var doc = IdeApp.Workbench.GetDocument (part.Region.FileName); - ctx = new CSharpTypeResolveContext (implementingType.Compilation.MainAssembly, null, implementingType, null); - options.Document = doc; - if (member is IUnresolvedMethod) - return GenerateCode ((IMethod) ((IUnresolvedMethod)member).CreateResolved (ctx), options); - if (member is IUnresolvedProperty) - return GenerateCode ((IProperty) ((IUnresolvedProperty)member).CreateResolved (ctx), options); - if (member is IUnresolvedField) - return GenerateCode ((IField) ((IUnresolvedField)member).CreateResolved (ctx), options); - if (member is IUnresolvedEvent) - return GenerateCode ((IEvent) ((IUnresolvedEvent)member).CreateResolved (ctx), options); + if (member is IMethodSymbol) + return GenerateCode ((IMethodSymbol)member, options); + if (member is IPropertySymbol) + return GenerateCode ((IPropertySymbol)member, options); + if (member is IFieldSymbol) + return GenerateCode ((IFieldSymbol)member, options); + if (member is IEventSymbol) + return GenerateCode ((IEventSymbol)member, options); throw new NotSupportedException ("member " + member + " is not supported."); } - - public override CodeGeneratorMemberResult CreateMemberImplementation (ITypeDefinition implementingType, - IUnresolvedTypeDefinition part, - IMember member, - bool explicitDeclaration) + + public static CodeGeneratorMemberResult CreatePartialMemberImplementation (DocumentContext document, TextEditor editor, ITypeSymbol implementingType, Location part, ISymbol member, bool explicitDeclaration) { - SetIndentTo (part); - var options = new CodeGenerationOptions () { + var options = new CodeGenerationOptions { ExplicitDeclaration = explicitDeclaration, ImplementingType = implementingType, Part = part, - Document = IdeApp.Workbench.GetDocument (part.Region.FileName) + DocumentContext = document, + Editor = editor }; - if (member is IMethod) - return GenerateCode ((IMethod)member, options); - if (member is IProperty) - return GenerateCode ((IProperty)member, options); - if (member is IField) - return GenerateCode ((IField)member, options); - if (member is IEvent) - return GenerateCode ((IEvent)member, options); + + if (member is IMethodSymbol) + return GeneratePartialCode ((IMethodSymbol)member, options); throw new NotSupportedException ("member " + member + " is not supported."); } - - void AppendBraceStart (StringBuilder result, BraceStyle braceStyle) - { - switch (braceStyle) { - case BraceStyle.BannerStyle: - case BraceStyle.EndOfLine: - result.Append (" {"); - AppendLine (result); - break; - case BraceStyle.EndOfLineWithoutSpace: - result.Append ("{"); - AppendLine (result); - break; - case BraceStyle.NextLine: - AppendLine (result); - AppendIndent (result); - result.Append ("{"); - AppendLine (result); - break; - case BraceStyle.NextLineShifted: - AppendLine (result); - result.Append (GetIndent (IndentLevel + 1)); - result.Append ("{"); - AppendLine (result); - break; - case BraceStyle.NextLineShifted2: - AppendLine (result); - result.Append (GetIndent (IndentLevel + 1)); - result.Append ("{"); - AppendLine (result); - IndentLevel++; - break; - default: - goto case BraceStyle.NextLine; - } - IndentLevel++; - } - - void AppendBraceEnd (StringBuilder result, BraceStyle braceStyle) - { - switch (braceStyle) { - case BraceStyle.EndOfLineWithoutSpace: - case BraceStyle.NextLine: - case BraceStyle.EndOfLine: - IndentLevel --; - AppendIndent (result); - result.Append ("}"); - break; - case BraceStyle.BannerStyle: - case BraceStyle.NextLineShifted: - AppendIndent (result); - result.Append ("}"); - IndentLevel--; - break; - case BraceStyle.NextLineShifted2: - IndentLevel--; - AppendIndent (result); - result.Append ("}"); - IndentLevel--; - break; - default: - goto case BraceStyle.NextLine; - } - } - - void AppendIndent (StringBuilder result) - { - result.Append (GetIndent (IndentLevel)); - } - - void AppendReturnType (StringBuilder result, CodeGenerationOptions options, IType type) +// +// void AppendBraceStart (StringBuilder result, BraceStyle braceStyle) +// { +// switch (braceStyle) { +// case BraceStyle.BannerStyle: +// case BraceStyle.EndOfLine: +// result.Append (" {"); +// AppendLine (result); +// break; +// case BraceStyle.EndOfLineWithoutSpace: +// result.Append ("{"); +// AppendLine (result); +// break; +// case BraceStyle.NextLine: +// AppendLine (result); +// AppendIndent (result); +// result.Append ("{"); +// AppendLine (result); +// break; +// case BraceStyle.NextLineShifted: +// AppendLine (result); +// result.Append (GetIndent (IndentLevel + 1)); +// result.Append ("{"); +// AppendLine (result); +// break; +// case BraceStyle.NextLineShifted2: +// AppendLine (result); +// result.Append (GetIndent (IndentLevel + 1)); +// result.Append ("{"); +// AppendLine (result); +// IndentLevel++; +// break; +// default: +// goto case BraceStyle.NextLine; +// } +// IndentLevel++; +// } +// +// void AppendBraceEnd (StringBuilder result, BraceStyle braceStyle) +// { +// switch (braceStyle) { +// case BraceStyle.EndOfLineWithoutSpace: +// case BraceStyle.NextLine: +// case BraceStyle.EndOfLine: +// IndentLevel --; +// AppendIndent (result); +// result.Append ("}"); +// break; +// case BraceStyle.BannerStyle: +// case BraceStyle.NextLineShifted: +// AppendIndent (result); +// result.Append ("}"); +// IndentLevel--; +// break; +// case BraceStyle.NextLineShifted2: +// IndentLevel--; +// AppendIndent (result); +// result.Append ("}"); +// IndentLevel--; +// break; +// default: +// goto case BraceStyle.NextLine; +// } +// } +// +// void AppendIndent (StringBuilder result) +// { +// result.Append (GetIndent (IndentLevel)); +// } +// + static void AppendReturnType (StringBuilder result, CodeGenerationOptions options, ITypeSymbol type) { if (type == null) throw new ArgumentNullException ("type"); - var implementingType = options.Part; - var loc = implementingType.Region.End; - - var pf = implementingType.UnresolvedFile; - var file = pf as CSharpUnresolvedFile; - var resolved = type; - if (resolved.Kind == TypeKind.Unknown) { - result.Append (type.FullName); - return; - } - var def = type.GetDefinition (); - if (def != null) { - using (var stringWriter = new System.IO.StringWriter ()) { - var formatter = new TextWriterTokenWriter (stringWriter); - stringWriter.NewLine = EolMarker; - var visitor = new CSharpOutputVisitor (formatter, FormattingOptionsFactory.CreateMono ()); - var shortType = CreateShortType (def.Compilation, file, loc, resolved); - shortType.AcceptVisitor (visitor); - - var typeString = stringWriter.ToString (); - if (typeString.StartsWith ("global::")) - typeString = typeString.Substring ("global::".Length); - result.Append (typeString); - } - } else { - result.Append (new ICSharpCode.NRefactory.CSharp.CSharpAmbience ().ConvertType (type)); - } - } - - /* - void ResolveReturnTypes () - { - returnType = member.ReturnType; - foreach (IUsing u in unit.Usings) { - foreach (KeyValuePair<string, IReturnType> alias in u.Aliases) { - if (alias.Key == member.ReturnType.FullName) { - returnType = alias.Value; - return; - } - } - } - }*/ + result.Append (type.ToMinimalDisplayString (options.SemanticModel, options.Part.SourceSpan.Start)); - - CodeGeneratorMemberResult GenerateCode (IField field, CodeGenerationOptions options) +// var implementingType = options.Part; +// var loc = implementingType.Region.End; +// +// var pf = implementingType.UnresolvedFile; +// var file = pf as CSharpUnresolvedFile; +// var resolved = type; +// if (resolved.Kind == TypeKind.Unknown) { +// result.Append (type.FullName); +// return; +// } +// var def = type.GetDefinition (); +// if (def != null) { +// using (var stringWriter = new System.IO.StringWriter ()) { +// var formatter = new TextWriterTokenWriter (stringWriter); +// stringWriter.NewLine = EolMarker; +// var visitor = new CSharpOutputVisitor (formatter, FormattingOptionsFactory.CreateMono ()); +// var shortType = CreateShortType (def.Compilation, file, loc, resolved); +// shortType.AcceptVisitor (visitor); +// +// var typeString = stringWriter.ToString (); +// if (typeString.StartsWith ("global::")) +// typeString = typeString.Substring ("global::".Length); +// result.Append (typeString); +// } +// } else { +// result.Append (new ICSharpCode.NRefactory.CSharp.CSharpAmbience ().ConvertType (type)); +// } + } +// +// /* +// void ResolveReturnTypes () +// { +// returnType = member.ReturnType; +// foreach (IUsing u in unit.Usings) { +// foreach (KeyValuePair<string, IReturnType> alias in u.Aliases) { +// if (alias.Key == member.ReturnType.FullName) { +// returnType = alias.Value; +// return; +// } +// } +// } +// }*/ +// +// + static CodeGeneratorMemberResult GenerateCode (IFieldSymbol field, CodeGenerationOptions options) { StringBuilder result = new StringBuilder (); AppendIndent (result); AppendModifiers (result, options, field); result.Append (" "); - AppendReturnType (result, options, field.ReturnType); + AppendReturnType (result, options, field.Type); result.Append (" "); result.Append (CSharpAmbience.FilterName (field.Name)); result.Append (";"); return new CodeGeneratorMemberResult (result.ToString (), -1, -1); } + + static void AppendIndent (StringBuilder result) + { + + } - CodeGeneratorMemberResult GenerateCode (IEvent evt, CodeGenerationOptions options) + static CodeGeneratorMemberResult GenerateCode (IEventSymbol evt, CodeGenerationOptions options) { StringBuilder result = new StringBuilder (); AppendObsoleteAttribute (result, options, evt); AppendModifiers (result, options, evt); result.Append ("event "); - AppendReturnType (result, options, evt.ReturnType); + AppendReturnType (result, options, evt.Type); result.Append (" "); if (options.ExplicitDeclaration) { - result.Append (ambience.GetString (evt.DeclaringTypeDefinition, OutputFlags.IncludeGenerics)); + AppendReturnType (result, options, evt.ContainingType); result.Append ("."); } + result.Append (CSharpAmbience.FilterName (evt.Name)); if (options.ExplicitDeclaration) { - AppendBraceStart (result, Policy.EventBraceStyle); + result.Append ("{"); AppendIndent (result); - result.Append ("add"); - AppendBraceStart (result, Policy.EventAddBraceStyle); + result.Append ("add {"); AppendIndent (result); result.Append ("// TODO"); AppendLine (result); - AppendBraceEnd (result, Policy.EventAddBraceStyle); - + result.Append ("}"); + AppendIndent (result); - result.Append ("remove"); - AppendBraceStart (result, Policy.EventRemoveBraceStyle); + result.Append ("remove {"); AppendIndent (result); result.Append ("// TODO"); AppendLine (result); - - AppendBraceEnd (result, Policy.EventRemoveBraceStyle); - AppendBraceEnd (result, Policy.EventBraceStyle); + result.Append ("}}"); } else { result.Append (";"); } return new CodeGeneratorMemberResult (result.ToString ()); } - void AppendNotImplementedException (StringBuilder result, CodeGenerationOptions options, - out int bodyStartOffset, out int bodyEndOffset) + static void AppendNotImplementedException (StringBuilder result, CodeGenerationOptions options, out int bodyStartOffset, out int bodyEndOffset) { AppendIndent (result); bodyStartOffset = result.Length; result.Append ("throw new "); result.Append (options.GetShortType ("System", "NotImplementedException")); - // AppendReturnType (result, options.ImplementingType, options.Ctx.GetTypeDefinition (typeof (System.NotImplementedException))); - if (Policy.BeforeMethodCallParentheses) - result.Append (" "); result.Append ("();"); bodyEndOffset = result.Length; AppendLine (result); @@ -385,7 +432,7 @@ namespace MonoDevelop.CSharp.Refactoring " see http://docs.xamarin.com/guides/ios/application_fundamentals/delegates,_protocols,_and_events" }; - void AppendMonoTouchTodo (StringBuilder result, CodeGenerationOptions options, out int bodyStartOffset, out int bodyEndOffset) + static void AppendMonoTouchTodo (StringBuilder result, CodeGenerationOptions options, out int bodyStartOffset, out int bodyEndOffset) { AppendIndent (result); bodyStartOffset = result.Length; @@ -395,34 +442,31 @@ namespace MonoDevelop.CSharp.Refactoring } result.Append ("throw new "); result.Append (options.GetShortType ("System", "NotImplementedException")); - - if (Policy.BeforeMethodCallParentheses) - result.Append (" "); result.Append ("();"); bodyEndOffset = result.Length; AppendLine (result); } - CodeGeneratorMemberResult GenerateCode (IMethod method, CodeGenerationOptions options) + static CodeGeneratorMemberResult GenerateCode (IMethodSymbol method, CodeGenerationOptions options) { int bodyStartOffset = -1, bodyEndOffset = -1; - StringBuilder result = new StringBuilder (); + var result = new StringBuilder (); AppendObsoleteAttribute (result, options, method); AppendModifiers (result, options, method); - if (method.IsPartial) - result.Append ("partial "); + // if (method.IsPartial) + // result.Append ("partial "); AppendReturnType (result, options, method.ReturnType); result.Append (" "); if (options.ExplicitDeclaration) { - AppendReturnType (result, options, method.DeclaringType); + AppendReturnType (result, options, method.ContainingType); result.Append ("."); } result.Append (CSharpAmbience.FilterName (method.Name)); - if (method.TypeParameters.Count > 0) { + if (method.TypeParameters.Length > 0) { result.Append ("<"); - for (int i = 0; i < method.TypeParameters.Count; i++) { + for (int i = 0; i < method.TypeParameters.Length; i++) { if (i > 0) result.Append (", "); var p = method.TypeParameters [i]; @@ -430,86 +474,82 @@ namespace MonoDevelop.CSharp.Refactoring } result.Append (">"); } - if (Policy.BeforeMethodDeclarationParentheses) - result.Append (" "); result.Append ("("); - AppendParameterList (result, options, method.Parameters); + AppendParameterList (result, options, method.Parameters, true); result.Append (")"); - + var typeParameters = method.TypeParameters; - - // This should also check the types are in the correct mscorlib - Func<IType, bool> validBaseType = t => t.FullName != "System.Object" && t.FullName != "System.ValueType"; - bool isFromInterface = method.DeclaringType != null && method.DeclaringTypeDefinition.Kind == TypeKind.Interface; + // // This should also check the types are in the correct mscorlib + // Func<IType, bool> validBaseType = t => t.FullName != "System.Object" && t.FullName != "System.ValueType"; + // + // bool isFromInterface = method.DeclaringType != null && method.DeclaringTypeDefinition.Kind == TypeKind.Interface; + // + // if (!options.ExplicitDeclaration && isFromInterface && typeParameters.Any (p => p.HasDefaultConstructorConstraint || p.HasReferenceTypeConstraint || p.HasValueTypeConstraint || p.DirectBaseTypes.Any (validBaseType))) { + // result.Append (" where "); + // int typeParameterCount = 0; + // foreach (var p in typeParameters) { + // if (typeParameterCount != 0) + // result.Append (", "); + // + // typeParameterCount++; + // result.Append (CSharpAmbience.FilterName (p.Name)); + // result.Append (" : "); + // int constraintCount = 0; + // + // if (p.HasDefaultConstructorConstraint) { + // result.Append ("new ()"); + // constraintCount++; + // } + // + // if (p.HasValueTypeConstraint) { + // if (constraintCount != 0) + // result.Append (", "); + // result.Append ("struct"); + // constraintCount++; + // } + // + // if (p.HasReferenceTypeConstraint) { + // if (constraintCount != 0) + // result.Append (", "); + // result.Append ("class"); + // constraintCount++; + // } + // // bool hadInterfaces = false; + // foreach (var c in p.DirectBaseTypes.Where (validBaseType)) { + // if (constraintCount != 0) + // result.Append (", "); + // constraintCount++; + // AppendReturnType (result, options, c); + // // if (c.Kind == TypeKind.Interface) + // // hadInterfaces = true; + // } + // } + // } - if (!options.ExplicitDeclaration && isFromInterface && typeParameters.Any (p => p.HasDefaultConstructorConstraint || p.HasReferenceTypeConstraint || p.HasValueTypeConstraint || p.DirectBaseTypes.Any (validBaseType))) { - result.Append (" where "); - int typeParameterCount = 0; - foreach (var p in typeParameters) { - if (typeParameterCount != 0) - result.Append (", "); - - typeParameterCount++; - result.Append (CSharpAmbience.FilterName (p.Name)); - result.Append (" : "); - int constraintCount = 0; - - if (p.HasDefaultConstructorConstraint) { - result.Append ("new ()"); - constraintCount++; - } - - if (p.HasValueTypeConstraint) { - if (constraintCount != 0) - result.Append (", "); - result.Append ("struct"); - constraintCount++; - } - - if (p.HasReferenceTypeConstraint) { - if (constraintCount != 0) - result.Append (", "); - result.Append ("class"); - constraintCount++; - } - // bool hadInterfaces = false; - foreach (var c in p.DirectBaseTypes.Where (validBaseType)) { - if (constraintCount != 0) - result.Append (", "); - constraintCount++; - AppendReturnType (result, options, c); - // if (c.Kind == TypeKind.Interface) - // hadInterfaces = true; - } - } - } - - if (options.ImplementingType.Kind == TypeKind.Interface) { + if (options.ImplementingType.TypeKind == TypeKind.Interface) { result.Append (";"); } else { - AppendBraceStart (result, Policy.MethodBraceStyle); - if (method.Name == "ToString" && (method.Parameters == null || method.Parameters.Count == 0) && method.ReturnType != null/* && method.ReturnType.FullName == "System.String"*/) { + result.Append ("{"); + if (method.Name == "ToString" && method.Parameters.Length == 0 && method.ReturnType != null/* && method.ReturnType.FullName == "System.String"*/) { AppendIndent (result); bodyStartOffset = result.Length; result.Append ("return string.Format"); - if (Policy.BeforeMethodDeclarationParentheses) - result.Append (" "); result.Append ("(\"["); result.Append (options.ImplementingType.Name); - if (options.ImplementingType.Properties.Any ()) + if (options.ImplementingType.GetMembers ().OfType<IPropertySymbol> ().Any ()) result.Append (": "); int i = 0; - var properties = new List<IProperty> (); + var properties = new List<IPropertySymbol> (); - foreach (IProperty property in options.ImplementingType.Properties) { + foreach (var property in options.ImplementingType.GetMembers ().OfType<IPropertySymbol> ()) { if (properties.Any (p => p.Name == property.Name)) continue; properties.Add (property); } - foreach (IProperty property in properties) { - if (property.IsStatic || !property.IsPublic) + foreach (var property in properties) { + if (property.IsStatic || property.DeclaredAccessibility != Accessibility.Public) continue; if (i > 0) result.Append (", "); @@ -519,8 +559,8 @@ namespace MonoDevelop.CSharp.Refactoring result.Append ("}"); } result.Append ("]\""); - foreach (IProperty property in properties) { - if (property.IsStatic || !property.IsPublic) + foreach (var property in properties) { + if (property.IsStatic || property.DeclaredAccessibility != Accessibility.Public) continue; result.Append (", "); result.Append (property.Name); @@ -530,72 +570,60 @@ namespace MonoDevelop.CSharp.Refactoring AppendLine (result); } else if (IsMonoTouchModelMember (method)) { AppendMonoTouchTodo (result, options, out bodyStartOffset, out bodyEndOffset); - } else if (method.IsAbstract || !(method.IsVirtual || method.IsOverride) || method.DeclaringTypeDefinition.Kind == TypeKind.Interface) { + } else if (method.IsAbstract || !(method.IsVirtual || method.IsOverride) || method.ContainingType.TypeKind == TypeKind.Interface) { AppendNotImplementedException (result, options, out bodyStartOffset, out bodyEndOffset); } else { bool skipBody = false; // Analyze if the body consists just of a single throw instruction // See: Bug 1373 - overriding [Model] class methods shouldn't insert base.Methods // TODO: Extend this to user defined code. - try { - if (method.Region.FileName == null) { - var asm = AssemblyDefinition.ReadAssembly (method.ParentAssembly.UnresolvedAssembly.Location); - foreach (var type in asm.MainModule.Types) { - if (type.FullName != method.DeclaringType.FullName) - continue; - foreach (var m in type.Resolve ().Methods) { - if (m.HasBody && m.Name == method.Name) { - var context = new DecompilerContext (asm.MainModule); - - context.CurrentType = type; - - context.Settings = new DecompilerSettings () { - AnonymousMethods = true, - AutomaticEvents = true, - AutomaticProperties = true, - ForEachStatement = true, - LockStatement = true - }; - - var astBuilder = new AstBuilder (context); - astBuilder.AddMethod (m); - - astBuilder.RunTransformations (o => false); - - var visitor = new ThrowsExceptionVisitor (); - astBuilder.SyntaxTree.AcceptVisitor (visitor); - skipBody = visitor.Throws; - if (skipBody) - break; - } - } - if (skipBody) - break; - } - } - } catch (Exception) { - } + // try { + // if (method.Region.FileName == null) { + // var asm = AssemblyDefinition.ReadAssembly (method.ParentAssembly.UnresolvedAssembly.Location); + // foreach (var type in asm.MainModule.Types) { + // if (type.FullName != method.DeclaringType.FullName) + // continue; + // foreach (var m in type.Resolve ().Methods) { + // if (m.HasBody && m.Name == method.Name) { + // var context = new DecompilerContext (asm.MainModule); + // + // context.CurrentType = type; + // + // context.Settings = new DecompilerSettings () { + // AnonymousMethods = true, + // AutomaticEvents = true, + // AutomaticProperties = true, + // ForEachStatement = true, + // LockStatement = true + // }; + // + // var astBuilder = new AstBuilder (context); + // astBuilder.AddMethod (m); + // + // astBuilder.RunTransformations (o => false); + // + // var visitor = new ThrowsExceptionVisitor (); + // astBuilder.SyntaxTree.AcceptVisitor (visitor); + // skipBody = visitor.Throws; + // if (skipBody) + // break; + // } + // } + // if (skipBody) + // break; + // } + // } + // } catch (Exception) { + // } AppendIndent (result); bodyStartOffset = result.Length; if (!skipBody) { - if (method.ReturnType.ReflectionName != typeof(void).FullName) + if (method.ReturnType.SpecialType != SpecialType.System_Void) result.Append ("return "); result.Append ("base."); result.Append (CSharpAmbience.FilterName (method.Name)); - if (Policy.BeforeMethodCallParentheses) - result.Append (" "); result.Append ("("); - for (int i = 0; i < method.Parameters.Count; i++) { - if (i > 0) - result.Append (", "); - - var p = method.Parameters [i]; - if (p.IsOut) - result.Append ("out "); - if (p.IsRef) - result.Append ("ref "); - result.Append (CSharpAmbience.FilterName (p.Name)); - } + AppendParameterList (result, options, method.Parameters, false); result.Append (");"); } else { result.Append ("throw new System.NotImplementedException ();"); @@ -603,114 +631,141 @@ namespace MonoDevelop.CSharp.Refactoring bodyEndOffset = result.Length; AppendLine (result); } - AppendBraceEnd (result, Policy.MethodBraceStyle); + result.Append ("}"); } return new CodeGeneratorMemberResult (result.ToString (), bodyStartOffset, bodyEndOffset); } - - class ThrowsExceptionVisitor : DepthFirstAstVisitor + + + static CodeGeneratorMemberResult GeneratePartialCode (IMethodSymbol method, CodeGenerationOptions options) { - public bool Throws = false; - - public override void VisitBlockStatement (BlockStatement blockStatement) - { - if (blockStatement.Statements.Count == 1 && blockStatement.Statements.First () is ThrowStatement) - Throws = true; + int bodyStartOffset = -1, bodyEndOffset = -1; + var result = new StringBuilder (); + AppendObsoleteAttribute (result, options, method); + result.Append ("partial "); + AppendReturnType (result, options, method.ReturnType); + result.Append (" "); + if (options.ExplicitDeclaration) { + AppendReturnType (result, options, method.ContainingType); + result.Append ("."); } + + result.Append (CSharpAmbience.FilterName (method.Name)); + if (method.TypeParameters.Length > 0) { + result.Append ("<"); + for (int i = 0; i < method.TypeParameters.Length; i++) { + if (i > 0) + result.Append (", "); + var p = method.TypeParameters [i]; + result.Append (CSharpAmbience.FilterName (p.Name)); + } + result.Append (">"); + } + result.Append ("("); + AppendParameterList (result, options, method.Parameters, true); + result.Append (")"); + + var typeParameters = method.TypeParameters; + result.AppendLine ("{"); + bodyStartOffset = result.Length; + AppendLine (result); + bodyEndOffset = result.Length; + result.AppendLine ("}"); + return new CodeGeneratorMemberResult (result.ToString (), bodyStartOffset, bodyEndOffset); } - - void AppendParameterList (StringBuilder result, CodeGenerationOptions options, IList<IParameter> parameters) + +// class ThrowsExceptionVisitor : DepthFirstAstVisitor +// { +// public bool Throws = false; +// +// public override void VisitBlockStatement (BlockStatement blockStatement) +// { +// if (blockStatement.Statements.Count == 1 && blockStatement.Statements.First () is ThrowStatement) +// Throws = true; +// } +// } + + static void AppendParameterList (StringBuilder result, CodeGenerationOptions options, IList<IParameterSymbol> parameters, bool asParameterList) { for (int i = 0; i < parameters.Count; i++) { if (i > 0) result.Append (", "); var p = parameters[i]; - if (p.IsOut) - result.Append ("out "); - if (p.IsRef) - result.Append ("ref "); - if (p.IsParams) - result.Append ("params "); - AppendReturnType (result, options, p.Type); - result.Append (" "); + if (asParameterList) { + if (p.RefKind == RefKind.Out) + result.Append ("out "); + if (p.RefKind == RefKind.Ref) + result.Append ("ref "); + if (p.IsParams) + result.Append ("params "); + AppendReturnType (result, options, p.Type); + result.Append (" "); + } result.Append (CSharpAmbience.FilterName (p.Name)); - if (p.ConstantValue != null) { + if (p.HasExplicitDefaultValue) { result.Append (" = "); - if (p.Type.Kind == TypeKind.Enum) { - bool found = false; - foreach (var literal in GetEnumLiterals(p.Type)) { - if (literal.ConstantValue.Equals (p.ConstantValue)) { - AppendReturnType (result, options, p.Type); - result.Append ("."+ literal.Name); - found = true; - break; - } - } - if (!found) { + if (p.ExplicitDefaultValue is Enum) { + var name = Enum.GetName (p.ExplicitDefaultValue.GetType (), p.ExplicitDefaultValue); + if (name != null) + { + AppendReturnType (result, options, p.Type); + result.Append ("."+ name); + } else { result.Append ("("); AppendReturnType (result, options, p.Type); - result.Append (")" + p.ConstantValue); + result.Append (")" + p.ExplicitDefaultValue); } - } else if (p.ConstantValue is char) { - result.Append ("'" + p.ConstantValue + "'"); - } else if (p.ConstantValue is string) { - result.Append ("\"" + CSharpTextEditorIndentation.ConvertToStringLiteral ((string)p.ConstantValue) + "\""); - } else if (p.ConstantValue is bool) { - result.Append ((bool)p.ConstantValue ? "true" : "false"); + } else if (p.ExplicitDefaultValue is char) { + result.Append ("'" + p.ExplicitDefaultValue + "'"); + } else if (p.ExplicitDefaultValue is string) { + result.Append ("\"" + CSharpTextEditorIndentation.ConvertToStringLiteral ((string)p.ExplicitDefaultValue) + "\""); + } else if (p.ExplicitDefaultValue is bool) { + result.Append ((bool)p.ExplicitDefaultValue ? "true" : "false"); } else { - result.Append (p.ConstantValue); + result.Append (p.ExplicitDefaultValue); } } } } - public IEnumerable<IField> GetEnumLiterals(IType type) + public static IEnumerable<string> GetEnumLiterals(Type type) { - if (type.Kind != TypeKind.Enum) - throw new ArgumentException ("Type is no enum."); - foreach (var field in type.GetFields (f => f.IsConst && f.IsPublic)) - yield return field; + return Enum.GetNames (type); } - static string GetModifiers (ITypeDefinition implementingType, IUnresolvedTypeDefinition implementingPart, IMember member) + static string GetModifiers (ITypeSymbol implementingType, Location implementingPart, ISymbol member) { StringBuilder result = new StringBuilder (); - if (member.IsPublic || (member.DeclaringType != null && member.DeclaringTypeDefinition.Kind == TypeKind.Interface)) { + if (member.DeclaredAccessibility == Accessibility.Public || (member.ContainingType != null && member.ContainingType.TypeKind == TypeKind.Interface)) { result.Append ("public "); - } else if (member.IsProtectedOrInternal) { - if (IdeApp.Workbench.ActiveDocument != null && member.DeclaringTypeDefinition.ParentAssembly != implementingType.ParentAssembly) { + } else if (member.DeclaredAccessibility == Accessibility.ProtectedOrInternal) { + if (IdeApp.Workbench.ActiveDocument != null && member.ContainingAssembly != implementingType.ContainingAssembly) { result.Append ("protected "); } else { result.Append ("internal protected "); } - } else if (member.IsProtectedAndInternal) { - if (IdeApp.Workbench.ActiveDocument != null && member.DeclaringTypeDefinition.ParentAssembly != implementingType.ParentAssembly) { - result.Append ("protected "); - } else { - result.Append ("protected internal "); - } - } else if (member.IsProtected) { + } else if (member.DeclaredAccessibility == Accessibility.Protected) { result.Append ("protected "); - } else if (member.IsInternal) { + } else if (member.DeclaredAccessibility == Accessibility.Internal) { result.Append ("internal "); } - + if (member.IsStatic) result.Append ("static "); - + return result.ToString (); } - void AppendModifiers (StringBuilder result, CodeGenerationOptions options, IMember member) + static void AppendModifiers (StringBuilder result, CodeGenerationOptions options, ISymbol member) { - AppendIndent (result); - if (options.ExplicitDeclaration || options.ImplementingType.Kind == TypeKind.Interface) - return; + //AppendIndent (result); + //if (options.ExplicitDeclaration || options.ImplementingType.Kind == TypeKind.Interface) + // return; result.Append (GetModifiers (options.ImplementingType, options.Part, member)); bool isFromInterface = false; - if (member.DeclaringType != null && member.DeclaringTypeDefinition.Kind == TypeKind.Interface) { + if (member.ContainingType != null && member.ContainingType.TypeKind == TypeKind.Interface) { isFromInterface = true; // TODO: Type system conversion. // if (options.ImplementingType != null) { @@ -724,51 +779,58 @@ namespace MonoDevelop.CSharp.Refactoring // } // } } + if (member is IMethodSymbol) { + var method = (IMethodSymbol)member; + if (!options.CreateProtocolMember) + result.Append ("override "); + if (method.IsAsync) + result.Append ("async "); + } - if (!isFromInterface && member.IsOverridable) - result.Append ("override "); - if (member is IMethod && ((IMethod)member).IsAsync) - result.Append ("async "); + if (member is IPropertySymbol) { + if (!options.CreateProtocolMember) + result.Append ("override "); + } } - CodeGeneratorMemberResult GenerateCode (IProperty property, CodeGenerationOptions options) + static CodeGeneratorMemberResult GenerateCode (IPropertySymbol property, CodeGenerationOptions options) { var regions = new List<CodeGeneratorBodyRegion> (); var result = new StringBuilder (); AppendObsoleteAttribute (result, options, property); AppendModifiers (result, options, property); - AppendReturnType (result, options, property.ReturnType); + AppendReturnType (result, options, property.Type); result.Append (" "); if (property.IsIndexer) { result.Append ("this["); - AppendParameterList (result, options, property.Parameters); + AppendParameterList (result, options, property.Parameters, true); result.Append ("]"); } else { - if (options.ExplicitDeclaration) { - result.Append (ambience.GetString (property.DeclaringType, OutputFlags.IncludeGenerics)); - result.Append ("."); - } +// if (options.ExplicitDeclaration) { +// result.Append (ambience.GetString (property.DeclaringType, OutputFlags.IncludeGenerics)); +// result.Append ("."); +// } result.Append (CSharpAmbience.FilterName (property.Name)); } - AppendBraceStart (result, Policy.PropertyBraceStyle); - if (property.CanGet) { + result.AppendLine (" {"); + if (property.GetMethod != null) { int bodyStartOffset, bodyEndOffset; AppendIndent (result); result.Append ("get"); - if (options.ImplementingType.Kind == TypeKind.Interface) { + if (options.ImplementingType.TypeKind == TypeKind.Interface) { result.AppendLine (";"); } else { - AppendBraceStart (result, Policy.PropertyGetBraceStyle); + result.AppendLine (" {"); if (IsMonoTouchModelMember (property)) { AppendMonoTouchTodo (result, options, out bodyStartOffset, out bodyEndOffset); - } else if (property.IsAbstract || property.DeclaringTypeDefinition.Kind == TypeKind.Interface) { + } else if (property.IsAbstract || property.ContainingType.TypeKind == TypeKind.Interface) { AppendNotImplementedException (result, options, out bodyStartOffset, out bodyEndOffset); } else { AppendIndent (result); bodyStartOffset = result.Length; - if (property.SymbolKind == SymbolKind.Indexer) { + if (property.IsIndexer) { result.Append ("return base["); - if (property.Parameters.Count > 0) + if (property.Parameters.Length > 0) result.Append (CSharpAmbience.FilterName (property.Parameters.First ().Name)); result.Append ("];"); } else { @@ -779,30 +841,30 @@ namespace MonoDevelop.CSharp.Refactoring bodyEndOffset = result.Length; AppendLine (result); } - AppendBraceEnd (result, Policy.PropertyGetBraceStyle); + result.Append ("}"); AppendLine (result); regions.Add (new CodeGeneratorBodyRegion (bodyStartOffset, bodyEndOffset)); } } - if (property.CanSet) { + if (property.SetMethod != null) { int bodyStartOffset, bodyEndOffset; AppendIndent (result); result.Append ("set"); - if (options.ImplementingType.Kind == TypeKind.Interface) { + if (options.ImplementingType.TypeKind == TypeKind.Interface) { result.AppendLine (";"); } else { - AppendBraceStart (result, Policy.PropertyGetBraceStyle); + result.AppendLine (" {"); if (IsMonoTouchModelMember (property)) { AppendMonoTouchTodo (result, options, out bodyStartOffset, out bodyEndOffset); - } else if (property.IsAbstract || property.DeclaringTypeDefinition.Kind == TypeKind.Interface) { + } else if (property.IsAbstract || property.ContainingType.TypeKind == TypeKind.Interface) { AppendNotImplementedException (result, options, out bodyStartOffset, out bodyEndOffset); } else { AppendIndent (result); bodyStartOffset = result.Length; - if (property.SymbolKind == SymbolKind.Indexer) { + if (property.IsIndexer) { result.Append ("base["); - if (property.Parameters.Count > 0) + if (property.Parameters.Length > 0) result.Append (CSharpAmbience.FilterName (property.Parameters.First ().Name)); result.Append ("] = value;"); } else { @@ -813,241 +875,126 @@ namespace MonoDevelop.CSharp.Refactoring bodyEndOffset = result.Length; AppendLine (result); } - AppendBraceEnd (result, Policy.PropertyGetBraceStyle); + result.Append ("}"); AppendLine (result); regions.Add (new CodeGeneratorBodyRegion (bodyStartOffset, bodyEndOffset)); } } - AppendBraceEnd (result, Policy.PropertyBraceStyle); + result.Append ("}"); return new CodeGeneratorMemberResult (result.ToString (), regions); } - - internal static bool IsMonoTouchModelMember (IMember member) + + internal static bool IsMonoTouchModelMember (ISymbol member) { - if (member == null || member.DeclaringType == null) + if (member == null || member.ContainingType == null) return false; - return member.DeclaringTypeDefinition.Attributes.Any (attr => attr.AttributeType != null && attr.AttributeType.ReflectionName == "MonoTouch.Foundation.ModelAttribute"); - } - - public override string CreateFieldEncapsulation (IUnresolvedTypeDefinition implementingType, IField field, string propertyName, Accessibility modifiers, bool readOnly) - { - SetIndentTo (implementingType); - StringBuilder result = new StringBuilder (); - AppendIndent (result); - -// if (modifiers != MonoDevelop.Projects.Dom.Modifiers.None) { -// switch (modifiers) { -// } -// result.Append (ambience.GetString (modifiers)); -// result.Append (" "); + return member.ContainingType.GetAttributes().Any (attr => attr.AttributeClass.MetadataName == "MonoTouch.Foundation.ModelAttribute"); + } + +//// public override string CreateFieldEncapsulation (IUnresolvedTypeDefinition implementingType, IField field, string propertyName, Accessibility modifiers, bool readOnly) +//// { +//// SetIndentTo (implementingType); +//// StringBuilder result = new StringBuilder (); +//// AppendIndent (result); +//// +////// if (modifiers != MonoDevelop.Projects.Dom.Modifiers.None) { +////// switch (modifiers) { +////// } +////// result.Append (ambience.GetString (modifiers)); +////// result.Append (" "); +////// } +//// var options = new CodeGenerationOptions () { +//// ImplementingType = field.DeclaringTypeDefinition, +//// Part = implementingType +//// }; +//// result.Append ("public "); +//// AppendReturnType (result, options, field.ReturnType); +//// result.Append (" "); +//// result.Append (propertyName); +//// AppendBraceStart (result, Policy.PropertyBraceStyle); +//// AppendIndent (result); +//// +//// result.Append ("get"); +//// AppendBraceStart (result, Policy.PropertyGetBraceStyle); +//// AppendIndent (result); +//// result.Append ("return this."); +//// result.Append (CSharpAmbience.FilterName (field.Name)); +//// result.Append (";"); +//// AppendLine (result); +//// AppendBraceEnd (result, Policy.PropertyGetBraceStyle); +//// AppendLine (result); +//// +//// if (!readOnly) { +//// AppendIndent (result); +//// result.Append ("set"); +//// AppendBraceStart (result, Policy.PropertyGetBraceStyle); +//// AppendIndent (result); +//// result.Append (CSharpAmbience.FilterName (field.Name)); +//// result.Append (" = value;"); +//// AppendLine (result); +//// AppendBraceEnd (result, Policy.PropertyGetBraceStyle); +//// AppendLine (result); +//// } +//// +//// AppendBraceEnd (result, Policy.PropertyBraceStyle); +//// return result.ToString (); +//// } +// +// int CountBlankLines (IReadonlyTextDocument doc, int startLine) +// { +// int result = 0; +// IDocumentLine line; +// while ((line = doc.GetLine (startLine + result)) != null && doc.GetLineIndent (line).Length == line.Length) { +// result++; // } - var options = new CodeGenerationOptions () { - ImplementingType = field.DeclaringTypeDefinition, - Part = implementingType - }; - result.Append ("public "); - AppendReturnType (result, options, field.ReturnType); - result.Append (" "); - result.Append (propertyName); - AppendBraceStart (result, Policy.PropertyBraceStyle); - AppendIndent (result); - - result.Append ("get"); - AppendBraceStart (result, Policy.PropertyGetBraceStyle); - AppendIndent (result); - result.Append ("return this."); - result.Append (CSharpAmbience.FilterName (field.Name)); - result.Append (";"); - AppendLine (result); - AppendBraceEnd (result, Policy.PropertyGetBraceStyle); - AppendLine (result); - - if (!readOnly) { - AppendIndent (result); - result.Append ("set"); - AppendBraceStart (result, Policy.PropertyGetBraceStyle); - AppendIndent (result); - result.Append (CSharpAmbience.FilterName (field.Name)); - result.Append (" = value;"); - AppendLine (result); - AppendBraceEnd (result, Policy.PropertyGetBraceStyle); - AppendLine (result); - } - - AppendBraceEnd (result, Policy.PropertyBraceStyle); - return result.ToString (); - } - - int CountBlankLines (MonoDevelop.Ide.Gui.Document doc, int startLine) - { - int result = 0; - DocumentLine line; - while ((line = doc.Editor.GetLine (startLine + result)) != null && doc.Editor.GetLineIndent (line).Length == line.Length) { - result++; - } - - return result; - } - - static bool InsertUsingAfter (AstNode node) - { - return node is NewLineNode && IsCommentOrUsing (node.GetNextSibling (s => !(s is NewLineNode))) || - IsCommentOrUsing (node) || (node is PreProcessorDirective); - } +// +// return result; +// } +// +// static bool InsertUsingAfter (AstNode node) +// { +// return node is NewLineNode && IsCommentOrUsing (node.GetNextSibling (s => !(s is NewLineNode))) || +// IsCommentOrUsing (node) || (node is PreProcessorDirective); +// } +// +// static bool IsCommentOrUsing (AstNode node) +// { +// return node is ICSharpCode.NRefactory.CSharp.Comment || +// node is UsingDeclaration || +// node is UsingAliasDeclaration; +// } +// - static bool IsCommentOrUsing (AstNode node) - { - return node is ICSharpCode.NRefactory.CSharp.Comment || - node is UsingDeclaration || - node is UsingAliasDeclaration; - } - - static AstNode SearchUsingInsertionPoint (AstNode parent) - { - var node = parent.FirstChild; - while (true) { - var next = node.NextSibling; - if (!InsertUsingAfter (next)) - break; - node = next; - } - return node; - } - - public override void AddGlobalNamespaceImport (MonoDevelop.Ide.Gui.Document doc, string nsName) - { - var parsedDocument = doc.ParsedDocument; - var unit = parsedDocument.GetAst<SyntaxTree> (); - if (unit == null) - return; - - var policy = doc.Project != null ? doc.Project.Policies.Get <CSharpFormattingPolicy> () : null; - if (policy == null) - policy = Policy; - - var node = SearchUsingInsertionPoint (unit); - - var text = new StringBuilder (); - int lines = 0; - - if (InsertUsingAfter (node)) { - lines = policy.BlankLinesBeforeUsings + 1; - while (lines-- > 0) { - text.Append (doc.Editor.EolMarker); - } - } - - text.Append ("using "); - text.Append (nsName); - text.Append (";"); - - int offset = 0; - if (node != null) { - var loc = InsertUsingAfter (node) ? node.EndLocation : node.StartLocation; - offset = Math.Max (0, doc.Editor.LocationToOffset (loc)); - } - - lines = policy.BlankLinesAfterUsings; - lines -= CountBlankLines (doc, doc.Editor.OffsetToLineNumber (offset) + 1); - if (lines > 0) - text.Append (doc.Editor.EolMarker); - while (lines-- > 0) { - text.Append (doc.Editor.EolMarker); - } - doc.Editor.Insert (offset, text.ToString ()); - doc.Editor.Document.CommitUpdateAll (); - } - - public override void AddLocalNamespaceImport (MonoDevelop.Ide.Gui.Document doc, string nsName, TextLocation caretLocation) - { - var parsedDocument = doc.ParsedDocument; - var unit = parsedDocument.GetAst<SyntaxTree> (); - if (unit == null) - return; - - var nsDecl = unit.GetNodeAt<NamespaceDeclaration> (caretLocation); - if (nsDecl == null) { - AddGlobalNamespaceImport (doc, nsName); - return; - } - - var policy = doc.Project != null ? doc.Project.Policies.Get <CSharpFormattingPolicy> () : null; - if (policy == null) - policy = Policy; - - - var node = SearchUsingInsertionPoint (nsDecl); - - var text = new StringBuilder (); - int lines = 0; - - if (InsertUsingAfter (node)) { - lines = policy.BlankLinesBeforeUsings + 1; - while (lines-- > 0) { - text.Append (doc.Editor.EolMarker); - } - } - - string indent = doc.Editor.GetLineIndent (nsDecl.StartLocation.Line) + "\t"; - text.Append (indent); - text.Append ("using "); - text.Append (nsName); - text.Append (";"); - - int offset; - TextLocation loc; - if (node != null) { - loc = InsertUsingAfter (node) ? node.EndLocation : node.StartLocation; - } else { - loc = nsDecl.LBraceToken.EndLocation; - } - offset = doc.Editor.LocationToOffset (loc); - - lines = policy.BlankLinesAfterUsings; - lines -= CountBlankLines (doc, doc.Editor.OffsetToLineNumber (offset) + 1); - if (lines > 0) - text.Append (doc.Editor.EolMarker); - while (lines-- > 0) { - text.Append (doc.Editor.EolMarker); - } - - doc.Editor.Insert (offset, text.ToString ()); - } - - public override string GetShortTypeString (MonoDevelop.Ide.Gui.Document doc, IType type) - { - var shortType = CreateShortType (doc.Compilation, doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile, doc.Editor.Caret.Location, type); - return OutputNode (doc, shortType); - } - - static string OutputNode (MonoDevelop.Ide.Gui.Document doc, AstNode node) - { - using (var stringWriter = new System.IO.StringWriter ()) { -// formatter.Indentation = indentLevel; - var formatter = new TextWriterTokenWriter (stringWriter); - stringWriter.NewLine = doc.Editor.EolMarker; - - var visitor = new CSharpOutputVisitor (formatter, doc.GetFormattingOptions ()); - node.AcceptVisitor (visitor); - return stringWriter.ToString (); - } - } - - - public AstType CreateShortType (ICompilation compilation, CSharpUnresolvedFile parsedFile, TextLocation loc, IType fullType) - { - var csResolver = parsedFile.GetResolver (compilation, loc); - var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver); - return builder.ConvertType (fullType); - } - - public override void CompleteStatement (MonoDevelop.Ide.Gui.Document doc) - { - var fixer = new ConstructFixer (doc.GetFormattingOptions (), doc.Editor.CreateNRefactoryTextEditorOptions ()); - int newOffset; - if (fixer.TryFix (doc.Editor.Document, doc.Editor.Caret.Offset, out newOffset)) { - doc.Editor.Caret.Offset = newOffset; - } - } +// +// static string OutputNode (TextEditor editor, DocumentContext context, AstNode node) +// { +// using (var stringWriter = new System.IO.StringWriter ()) { +//// formatter.Indentation = indentLevel; +// var formatter = new TextWriterTokenWriter (stringWriter); +// stringWriter.NewLine = editor.EolMarker; +// +// var visitor = new CSharpOutputVisitor (formatter, null /* TODO: BROKEN DUE ROSLYN PORT (note: that code should be unused) */ ); +// node.AcceptVisitor (visitor); +// return stringWriter.ToString (); +// } +// } +// +// +// public AstType CreateShortType (ICompilation compilation, CSharpUnresolvedFile parsedFile, TextLocation loc, IType fullType) +// { +// var csResolver = parsedFile.GetResolver (compilation, loc); +// var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver); +// return builder.ConvertType (fullType); +// } +// +// public override void CompleteStatement (MonoDevelop.Ide.Gui.Document doc) +// { +// // TODO: BROKEN DUE ROSLYN PORT - needs to be ported to NR6 +//// var fixer = new ConstructFixer (doc.GetFormattingOptions (), doc.Editor.CreateNRefactoryTextEditorOptions ()); +//// int newOffset; +//// if (fixer.TryFix (new DocumentWrapper (doc.Editor), doc.Editor.CaretOffset, out newOffset)) { +//// doc.Editor.CaretOffset = newOffset; +//// } +// } } -}
\ No newline at end of file +} |