Browse Source

Fixed a few cases where "IsKeyword" was not set correctly.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3787 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
9b1d4e2476
  1. 2
      src/Libraries/NRefactory/Project/Src/Ast/TypeReference.cs
  2. 2
      src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ToStringCodeGenerator.cs
  3. 2
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryASTConvertVisitor.cs
  4. 2
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs

2
src/Libraries/NRefactory/Project/Src/Ast/TypeReference.cs

@ -266,7 +266,7 @@ namespace ICSharpCode.NRefactory.Ast
this.Type = type; this.Type = type;
} }
[Obsolete("Type and SystemType are no longer distinguised - use the (string type, bool isKeyword) constructor instead!")] [Obsolete("Type and SystemType are no longer distinguished - use the (string type, bool isKeyword) constructor instead!")]
public TypeReference(string type, string systemType) public TypeReference(string type, string systemType)
{ {
this.Type = systemType; this.Type = systemType;

2
src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ToStringCodeGenerator.cs

@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
{ {
public override void GenerateCode(List<AbstractNode> nodes, IList items) public override void GenerateCode(List<AbstractNode> nodes, IList items)
{ {
TypeReference stringReference = new TypeReference("System.String"); TypeReference stringReference = new TypeReference("System.String", true);
MethodDeclaration method = new MethodDeclaration { MethodDeclaration method = new MethodDeclaration {
Name = "ToString", Name = "ToString",
Modifier = Modifiers.Public | Modifiers.Override, Modifier = Modifiers.Public | Modifiers.Override,

2
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryASTConvertVisitor.cs

@ -724,7 +724,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
region, c); region, c);
del.Modifiers |= ModifierEnum.Synthetic; del.Modifiers |= ModifierEnum.Synthetic;
CreateDelegate(del, eventDeclaration.Name + "EventHandler", CreateDelegate(del, eventDeclaration.Name + "EventHandler",
new AST.TypeReference("System.Void"), new AST.TypeReference("System.Void", true),
new AST.TemplateDefinition[0], new AST.TemplateDefinition[0],
eventDeclaration.Parameters); eventDeclaration.Parameters);
type = del.DefaultReturnType; type = del.DefaultReturnType;

2
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs

@ -413,7 +413,7 @@ namespace ICSharpCode.SharpDevelop.Dom.Refactoring
MethodDeclaration method = new MethodDeclaration { MethodDeclaration method = new MethodDeclaration {
Name = "On" + e.Name, Name = "On" + e.Name,
Modifier = ConvertModifier(modifier, context), Modifier = ConvertModifier(modifier, context),
TypeReference = new TypeReference("System.Void"), TypeReference = new TypeReference("System.Void", true),
Parameters = parameters Parameters = parameters
}; };

Loading…
Cancel
Save