pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix CSharpBinding reference to NRefactory.CSharp; fix long type names bug in CSharpAmbience

newNRvisualizers
Siegfried Pammer 14 years ago
parent
c50d1a4f46
commit
edd71b77e9
3 changed files with 16 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      TODOnewNR.txt
  2. 2
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
  3. 31
      src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs

1
TODOnewNR.txt
Unescape View File

@ -1,7 +1,6 @@
 
Commented code, needs to be ported and re-enabled: Commented code, needs to be ported and re-enabled:
ParseProjectContent ParseProjectContent
Ambiences
DefinitionViewPad DefinitionViewPad
Class Browser (removed from source tree; to be reimplemented using WPF) Class Browser (removed from source tree; to be reimplemented using WPF)
NRefactoryLanguageConverter NRefactoryLanguageConverter

2
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
Unescape View File

@ -90,7 +90,7 @@
<ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj"> <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
<Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project> <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
<Name>ICSharpCode.NRefactory.CSharp</Name> <Name>ICSharpCode.NRefactory.CSharp</Name>
<Private>False</Private> <Private>True</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj"> <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
<Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project> <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>

31
src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs
Unescape View File

@ -49,9 +49,7 @@ namespace ICSharpCode.NRefactory.CSharp
void ConvertMember(IMember member, ISynchronizedTypeResolveContext ctx, StringWriter writer) void ConvertMember(IMember member, ISynchronizedTypeResolveContext ctx, StringWriter writer)
{ {
TypeSystemAstBuilder astBuilder = new TypeSystemAstBuilder(ctx); TypeSystemAstBuilder astBuilder = CreateAstBuilder(ctx);
astBuilder.ShowModifiers = (ConversionFlags & ConversionFlags.ShowModifiers) == ConversionFlags.ShowModifiers;
astBuilder.ShowAccessibility = (ConversionFlags & ConversionFlags.ShowAccessibility) == ConversionFlags.ShowAccessibility;
astBuilder.ShowParameterNames = (ConversionFlags & ConversionFlags.ShowParameterNames) == ConversionFlags.ShowParameterNames; astBuilder.ShowParameterNames = (ConversionFlags & ConversionFlags.ShowParameterNames) == ConversionFlags.ShowParameterNames;
AttributedNode node = (AttributedNode)astBuilder.ConvertEntity(member); AttributedNode node = (AttributedNode)astBuilder.ConvertEntity(member);
@ -81,12 +79,19 @@ namespace ICSharpCode.NRefactory.CSharp
writer.Write((node is IndexerDeclaration) ? ']' : ')'); writer.Write((node is IndexerDeclaration) ? ']' : ')');
} }
} }
void ConvertTypeDeclaration(ITypeDefinition typeDef, ITypeResolveContext ctx, StringWriter writer) TypeSystemAstBuilder CreateAstBuilder(ITypeResolveContext ctx)
{ {
TypeSystemAstBuilder astBuilder = new TypeSystemAstBuilder(ctx); TypeSystemAstBuilder astBuilder = new TypeSystemAstBuilder(ctx);
astBuilder.ShowModifiers = (ConversionFlags & ConversionFlags.ShowModifiers) == ConversionFlags.ShowModifiers; astBuilder.ShowModifiers = (ConversionFlags & ConversionFlags.ShowModifiers) == ConversionFlags.ShowModifiers;
astBuilder.ShowAccessibility = (ConversionFlags & ConversionFlags.ShowAccessibility) == ConversionFlags.ShowAccessibility; astBuilder.ShowAccessibility = (ConversionFlags & ConversionFlags.ShowAccessibility) == ConversionFlags.ShowAccessibility;
astBuilder.AlwaysUseShortTypeNames = (ConversionFlags & ConversionFlags.UseFullyQualifiedTypeNames) != ConversionFlags.UseFullyQualifiedTypeNames;
return astBuilder;
}
void ConvertTypeDeclaration(ITypeDefinition typeDef, ITypeResolveContext ctx, StringWriter writer)
{
TypeSystemAstBuilder astBuilder = CreateAstBuilder(ctx);
TypeDeclaration typeDeclaration = (TypeDeclaration)astBuilder.ConvertEntity(typeDef); TypeDeclaration typeDeclaration = (TypeDeclaration)astBuilder.ConvertEntity(typeDef);
PrintModifiers(typeDeclaration.Modifiers, writer); PrintModifiers(typeDeclaration.Modifiers, writer);
if ((ConversionFlags & ConversionFlags.ShowDefinitionKeyWord) == ConversionFlags.ShowDefinitionKeyWord) { if ((ConversionFlags & ConversionFlags.ShowDefinitionKeyWord) == ConversionFlags.ShowDefinitionKeyWord) {
@ -113,7 +118,7 @@ namespace ICSharpCode.NRefactory.CSharp
void WriteTypeDeclarationName(ITypeDefinition typeDef, ITypeResolveContext ctx, StringWriter writer) void WriteTypeDeclarationName(ITypeDefinition typeDef, ITypeResolveContext ctx, StringWriter writer)
{ {
TypeSystemAstBuilder astBuilder = new TypeSystemAstBuilder(ctx); TypeSystemAstBuilder astBuilder = CreateAstBuilder(ctx);
if (typeDef.DeclaringTypeDefinition != null) { if (typeDef.DeclaringTypeDefinition != null) {
WriteTypeDeclarationName(typeDef.DeclaringTypeDefinition, ctx, writer); WriteTypeDeclarationName(typeDef.DeclaringTypeDefinition, ctx, writer);
writer.Write('.'); writer.Write('.');
@ -129,7 +134,7 @@ namespace ICSharpCode.NRefactory.CSharp
void WriteMemberDeclarationName(IMember member, ITypeResolveContext ctx, StringWriter writer) void WriteMemberDeclarationName(IMember member, ITypeResolveContext ctx, StringWriter writer)
{ {
TypeSystemAstBuilder astBuilder = new TypeSystemAstBuilder(ctx); TypeSystemAstBuilder astBuilder = CreateAstBuilder(ctx);
if ((ConversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) == ConversionFlags.UseFullyQualifiedMemberNames) { if ((ConversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) == ConversionFlags.UseFullyQualifiedMemberNames) {
writer.Write(ConvertType(member.DeclaringType)); writer.Write(ConvertType(member.DeclaringType));
writer.Write('.'); writer.Write('.');
@ -193,11 +198,7 @@ namespace ICSharpCode.NRefactory.CSharp
public string ConvertVariable(IVariable v, ITypeResolveContext context) public string ConvertVariable(IVariable v, ITypeResolveContext context)
{ {
using (var ctx = context.Synchronize()) { using (var ctx = context.Synchronize()) {
TypeSystemAstBuilder astBuilder = new TypeSystemAstBuilder(ctx); TypeSystemAstBuilder astBuilder = CreateAstBuilder(ctx);
astBuilder.ShowModifiers = (ConversionFlags & ConversionFlags.ShowModifiers) == ConversionFlags.ShowModifiers;
astBuilder.ShowAccessibility = (ConversionFlags & ConversionFlags.ShowAccessibility) == ConversionFlags.ShowAccessibility;
astBuilder.ShowParameterNames = (ConversionFlags & ConversionFlags.ShowParameterNames) == ConversionFlags.ShowParameterNames;
astBuilder.AlwaysUseShortTypeNames = (ConversionFlags & ConversionFlags.UseFullyQualifiedTypeNames) != ConversionFlags.UseFullyQualifiedTypeNames;
AstNode astNode = astBuilder.ConvertVariable(v); AstNode astNode = astBuilder.ConvertVariable(v);
CSharpFormattingOptions formatting = new CSharpFormattingOptions(); CSharpFormattingOptions formatting = new CSharpFormattingOptions();
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
@ -208,8 +209,7 @@ namespace ICSharpCode.NRefactory.CSharp
public string ConvertType(IType type) public string ConvertType(IType type)
{ {
TypeSystemAstBuilder astBuilder = new TypeSystemAstBuilder(MinimalResolveContext.Instance); TypeSystemAstBuilder astBuilder = CreateAstBuilder(MinimalResolveContext.Instance);
astBuilder.AlwaysUseShortTypeNames = (ConversionFlags & ConversionFlags.UseFullyQualifiedTypeNames) != ConversionFlags.UseFullyQualifiedTypeNames;
AstType astType = astBuilder.ConvertType(type); AstType astType = astBuilder.ConvertType(type);
CSharpFormattingOptions formatting = new CSharpFormattingOptions(); CSharpFormattingOptions formatting = new CSharpFormattingOptions();
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
@ -220,8 +220,7 @@ namespace ICSharpCode.NRefactory.CSharp
public string ConvertType(ITypeReference type, ITypeResolveContext context) public string ConvertType(ITypeReference type, ITypeResolveContext context)
{ {
using (var ctx = context.Synchronize()) { using (var ctx = context.Synchronize()) {
TypeSystemAstBuilder astBuilder = new TypeSystemAstBuilder(ctx); TypeSystemAstBuilder astBuilder = CreateAstBuilder(ctx);
astBuilder.AlwaysUseShortTypeNames = (ConversionFlags & ConversionFlags.UseFullyQualifiedTypeNames) != ConversionFlags.UseFullyQualifiedTypeNames;
AstType astType = astBuilder.ConvertTypeReference(type); AstType astType = astBuilder.ConvertTypeReference(type);
CSharpFormattingOptions formatting = new CSharpFormattingOptions(); CSharpFormattingOptions formatting = new CSharpFormattingOptions();
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();

Write Preview
Loading…
Cancel
Save