From 9b1d4e2476e21fee3d2f1349f89a1654c7d5b597 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Fri, 30 Jan 2009 20:20:29 +0000 Subject: [PATCH] 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 --- src/Libraries/NRefactory/Project/Src/Ast/TypeReference.cs | 2 +- .../TextEditor/Commands/CodeGenerators/ToStringCodeGenerator.cs | 2 +- .../Src/NRefactoryResolver/NRefactoryASTConvertVisitor.cs | 2 +- .../Project/Src/Refactoring/CodeGenerator.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Libraries/NRefactory/Project/Src/Ast/TypeReference.cs b/src/Libraries/NRefactory/Project/Src/Ast/TypeReference.cs index 2039b992f8..467bbae7c1 100644 --- a/src/Libraries/NRefactory/Project/Src/Ast/TypeReference.cs +++ b/src/Libraries/NRefactory/Project/Src/Ast/TypeReference.cs @@ -266,7 +266,7 @@ namespace ICSharpCode.NRefactory.Ast 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) { this.Type = systemType; diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ToStringCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ToStringCodeGenerator.cs index 45bee96d63..a4231dfb95 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ToStringCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/ToStringCodeGenerator.cs @@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { public override void GenerateCode(List nodes, IList items) { - TypeReference stringReference = new TypeReference("System.String"); + TypeReference stringReference = new TypeReference("System.String", true); MethodDeclaration method = new MethodDeclaration { Name = "ToString", Modifier = Modifiers.Public | Modifiers.Override, diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryASTConvertVisitor.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryASTConvertVisitor.cs index 681e199325..71aadbacf4 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryASTConvertVisitor.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryASTConvertVisitor.cs @@ -724,7 +724,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver region, c); del.Modifiers |= ModifierEnum.Synthetic; CreateDelegate(del, eventDeclaration.Name + "EventHandler", - new AST.TypeReference("System.Void"), + new AST.TypeReference("System.Void", true), new AST.TemplateDefinition[0], eventDeclaration.Parameters); type = del.DefaultReturnType; diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs index 084198fc29..958b8863ab 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs @@ -413,7 +413,7 @@ namespace ICSharpCode.SharpDevelop.Dom.Refactoring MethodDeclaration method = new MethodDeclaration { Name = "On" + e.Name, Modifier = ConvertModifier(modifier, context), - TypeReference = new TypeReference("System.Void"), + TypeReference = new TypeReference("System.Void", true), Parameters = parameters };