diff options
| author | Mike Krüger <mkrueger@novell.com> | 2009-10-09 18:13:22 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2009-10-09 18:13:22 +0400 |
| commit | 7ed58470daad8affd5ba49d99c9fba145a390c7a (patch) | |
| tree | 21582ed7f877a8805461ad1bae8dcc549e9fb2d2 /main/contrib | |
| parent | 04165909e9ca292f4a6fd98b02b8e4c8bdec3deb (diff) | |
* Src/Lexer/CSharp/Lexer.cs:
* Src/Lexer/AbstractLexer.cs: Fixed comment text, when comment
contains a tag.
svn path=/trunk/monodevelop/; revision=143871
Diffstat (limited to 'main/contrib')
| -rw-r--r-- | main/contrib/NRefactory/Project/ChangeLog | 6 | ||||
| -rw-r--r-- | main/contrib/NRefactory/Project/Src/Lexer/AbstractLexer.cs | 9 | ||||
| -rw-r--r-- | main/contrib/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/main/contrib/NRefactory/Project/ChangeLog b/main/contrib/NRefactory/Project/ChangeLog index 056de86e75..daf4626041 100644 --- a/main/contrib/NRefactory/Project/ChangeLog +++ b/main/contrib/NRefactory/Project/ChangeLog @@ -1,3 +1,9 @@ +2009-10-09 Mike Krüger <mkrueger@novell.com> + + * Src/Lexer/CSharp/Lexer.cs: + * Src/Lexer/AbstractLexer.cs: Fixed comment text, when comment + contains a tag. + 2009-10-08 Mike Krüger <mkrueger@novell.com> * NRefactory.csproj: diff --git a/main/contrib/NRefactory/Project/Src/Lexer/AbstractLexer.cs b/main/contrib/NRefactory/Project/Src/Lexer/AbstractLexer.cs index 3dd0f01bb1..898ddcf3d9 100644 --- a/main/contrib/NRefactory/Project/Src/Lexer/AbstractLexer.cs +++ b/main/contrib/NRefactory/Project/Src/Lexer/AbstractLexer.cs @@ -1,4 +1,4 @@ -// <file> +// <file> // <copyright see="prj:///doc/copyright.txt"/> // <license see="prj:///doc/license.txt"/> // <owner name="Mike Krüger" email="mike@icsharpcode.net"/> @@ -299,7 +299,12 @@ namespace ICSharpCode.NRefactory.Parser protected string ReadToEndOfLine() { - sb.Length = 0; + return ReadToEndOfLine (true); + } + protected string ReadToEndOfLine(bool resetBuilder) + { + if (resetBuilder) + sb.Length = 0; int nextChar; while ((nextChar = reader.Read()) != -1) { char ch = (char)nextChar; diff --git a/main/contrib/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs b/main/contrib/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs index f76f74b67b..78639c7371 100644 --- a/main/contrib/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs +++ b/main/contrib/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs @@ -816,7 +816,6 @@ namespace ICSharpCode.NRefactory.Parser.CSharp } sb.Length = 0; StringBuilder curWord = new StringBuilder(); - int nextChar; while ((nextChar = ReaderRead()) != -1) { char ch = (char)nextChar; @@ -833,9 +832,8 @@ namespace ICSharpCode.NRefactory.Parser.CSharp curWord.Length = 0; if (specialCommentHash.ContainsKey(tag)) { Location p = new Location(Col, Line); - string comment = ch + ReadToEndOfLine(); + string comment = ch + ReadToEndOfLine(false); this.TagComments.Add(new TagComment(tag, comment, isAtLineBegin, p, new Location(Col, Line))); - sb.Append(comment); break; } } |