Move NRefactory.CSharp to separate assembly.

ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs

@@ -117,20 +117,20 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 		}
 		
-		public virtual AstLocation StartLocation {
+		public virtual TextLocation StartLocation {
 			get {
 				var child = firstChild;
 				if (child == null)
-					return AstLocation.Empty;
+					return TextLocation.Empty;
 				return child.StartLocation;
 			}
 		}
 		
-		public virtual AstLocation EndLocation {
+		public virtual TextLocation EndLocation {
 			get {
 				var child = lastChild;
 				if (child == null)
-					return AstLocation.Empty;
+					return TextLocation.Empty;
 				return child.EndLocation;
 			}
 		}
@@ -506,10 +506,10 @@ namespace ICSharpCode.NRefactory.CSharp
 		
 		public AstNode GetNodeAt (int line, int column, Predicate<AstNode> pred = null)
 		{
-			return GetNodeAt (new AstLocation (line, column), pred);
+			return GetNodeAt (new TextLocation (line, column), pred);
 		}
 		
-		public AstNode GetNodeAt (AstLocation location, Predicate<AstNode> pred = null)
+		public AstNode GetNodeAt (TextLocation location, Predicate<AstNode> pred = null)
 		{
 			AstNode result = null;
 			AstNode node = this;
@@ -533,14 +533,14 @@ namespace ICSharpCode.NRefactory.CSharp
 		
 		public T GetNodeAt<T> (int line, int column) where T : AstNode
 		{
-			return GetNodeAt<T> (new AstLocation (line, column));
+			return GetNodeAt<T> (new TextLocation (line, column));
 		}
 		
 		/// <summary>
 		/// Gets the node specified by T at location. This is useful for getting a specific node from the tree. For example searching 
 		/// the current method declaration.
 		/// </summary>
-		public T GetNodeAt<T> (AstLocation location) where T : AstNode
+		public T GetNodeAt<T> (TextLocation location) where T : AstNode
 		{
 			T result = null;
 			AstNode node = this;
@@ -564,10 +564,10 @@ namespace ICSharpCode.NRefactory.CSharp
 		
 		public IEnumerable<AstNode> GetNodesBetween (int startLine, int startColumn, int endLine, int endColumn)
 		{
-			return GetNodesBetween (new AstLocation (startLine, startColumn), new AstLocation (endLine, endColumn));
+			return GetNodesBetween (new TextLocation (startLine, startColumn), new TextLocation (endLine, endColumn));
 		}
 		
-		public IEnumerable<AstNode> GetNodesBetween (AstLocation start, AstLocation end)
+		public IEnumerable<AstNode> GetNodesBetween (TextLocation start, TextLocation end)
 		{
 			AstNode node = this;
 			while (node != null) {
@@ -593,10 +593,10 @@ namespace ICSharpCode.NRefactory.CSharp
 		
 		public bool Contains (int line, int column)
 		{
-			return Contains (new AstLocation (line, column));
+			return Contains (new TextLocation (line, column));
 		}
 
-		public bool Contains (AstLocation location)
+		public bool Contains (TextLocation location)
 		{
 			return this.StartLocation <= location && location < this.EndLocation;
 		}

ICSharpCode.NRefactory.CSharp/Ast/CSharpModifierToken.cs

@@ -64,7 +64,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			get { return allModifiers; }
 		}
 		
-		public CSharpModifierToken (AstLocation location, Modifiers modifier) : base (location, 0)
+		public CSharpModifierToken (TextLocation location, Modifiers modifier) : base (location, 0)
 		{
 			this.Modifier = modifier;
 		}

ICSharpCode.NRefactory.CSharp/Ast/CSharpTokenNode.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // TokenNode.cs
 //  
 // Author:
@@ -38,7 +38,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 			}
 			
-			public NullCSharpTokenNode () : base (AstLocation.Empty, 0)
+			public NullCSharpTokenNode () : base (TextLocation.Empty, 0)
 			{
 			}
 			
@@ -60,28 +60,28 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 		}
 		
-		AstLocation startLocation;
-		public override AstLocation StartLocation {
+		TextLocation startLocation;
+		public override TextLocation StartLocation {
 			get {
 				return startLocation;
 			}
 		}
 		
 		protected int tokenLength;
-		public override AstLocation EndLocation {
+		public override TextLocation EndLocation {
 			get {
-				return new AstLocation (StartLocation.Line, StartLocation.Column + tokenLength);
+				return new TextLocation (StartLocation.Line, StartLocation.Column + tokenLength);
 			}
 		}
 		
-		public CSharpTokenNode (AstLocation location, int tokenLength)
+		public CSharpTokenNode (TextLocation location, int tokenLength)
 		{
 			this.startLocation = location;
 			this.tokenLength = tokenLength;
 		}
 		
 		#region IRelocationable implementation
-		void IRelocatable.SetStartLocation (AstLocation startLocation)
+		void IRelocatable.SetStartLocation (TextLocation startLocation)
 		{
 			this.startLocation = startLocation;
 		}

ICSharpCode.NRefactory.CSharp/Ast/ComposedType.cs

@@ -46,7 +46,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return !GetChildByRole(NullableRole).IsNull;
 			}
 			set {
-				SetChildByRole(NullableRole, value ? new CSharpTokenNode(AstLocation.Empty, 1) : null);
+				SetChildByRole(NullableRole, value ? new CSharpTokenNode(TextLocation.Empty, 1) : null);
 			}
 		}
 		
@@ -63,7 +63,7 @@ namespace ICSharpCode.NRefactory.CSharp
 					d--;
 				}
 				while (d < value) {
-					InsertChildBefore(GetChildByRole(PointerRole), new CSharpTokenNode(AstLocation.Empty, 1), PointerRole);
+					InsertChildBefore(GetChildByRole(PointerRole), new CSharpTokenNode(TextLocation.Empty, 1), PointerRole);
 					d++;
 				}
 			}
@@ -149,7 +149,7 @@ namespace ICSharpCode.NRefactory.CSharp
 					d--;
 				}
 				while (d < value) {
-					InsertChildBefore(GetChildByRole(Roles.Comma), new CSharpTokenNode(AstLocation.Empty, 1), Roles.Comma);
+					InsertChildBefore(GetChildByRole(Roles.Comma), new CSharpTokenNode(TextLocation.Empty, 1), Roles.Comma);
 					d++;
 				}
 			}

ICSharpCode.NRefactory.CSharp/Ast/ErrorNode.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // ErrorNode.cs
 //
 // Author:
@@ -34,7 +34,7 @@ namespace ICSharpCode.NRefactory.CSharp
 	/// </summary>
 	public class ErrorNode : AstNode
 	{
-		static AstLocation maxLoc = new AstLocation (int.MaxValue, int.MaxValue);
+		static TextLocation maxLoc = new TextLocation (int.MaxValue, int.MaxValue);
 		
 		public override NodeType NodeType {
 			get {
@@ -42,13 +42,13 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 		}
 				
-		public override AstLocation StartLocation {
+		public override TextLocation StartLocation {
 			get {
 				return maxLoc;
 			}
 		}
 		
-		public override AstLocation EndLocation {
+		public override TextLocation EndLocation {
 			get {
 				return maxLoc;
 			}

ICSharpCode.NRefactory.CSharp/Ast/Expressions/BaseReferenceExpression.cs

@@ -31,19 +31,19 @@ namespace ICSharpCode.NRefactory.CSharp
 	/// </summary>
 	public class BaseReferenceExpression : Expression
 	{
-		public AstLocation Location {
+		public TextLocation Location {
 			get;
 			set;
 		}
 		
-		public override AstLocation StartLocation {
+		public override TextLocation StartLocation {
 			get {
 				return Location;
 			}
 		}
-		public override AstLocation EndLocation {
+		public override TextLocation EndLocation {
 			get {
-				return new AstLocation (Location.Line, Location.Column + "base".Length);
+				return new TextLocation (Location.Line, Location.Column + "base".Length);
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/Expressions/EmptyExpression.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // EmptyExpression.cs
 //  
 // Author:
@@ -32,15 +32,15 @@ namespace ICSharpCode.NRefactory.CSharp
 	/// </summary>
 	public class EmptyExpression : Expression, IRelocatable
 	{
-		AstLocation location;
+		TextLocation location;
 
-		public override AstLocation StartLocation {
+		public override TextLocation StartLocation {
 			get {
 				return location;
 			}
 		}
 		
-		public override AstLocation EndLocation {
+		public override TextLocation EndLocation {
 			get {
 				return location;
 			}
@@ -50,13 +50,13 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 		}
 
-		public EmptyExpression (AstLocation location)
+		public EmptyExpression (TextLocation location)
 		{
 			this.location = location;
 		}
 		
 		#region IRelocationable implementation
-		void IRelocatable.SetStartLocation (AstLocation startLocation)
+		void IRelocatable.SetStartLocation (TextLocation startLocation)
 		{
 			this.location = startLocation;
 		}

ICSharpCode.NRefactory.CSharp/Ast/Expressions/IdentifierExpression.cs

@@ -38,7 +38,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			this.Identifier = identifier;
 		}
 		
-		public IdentifierExpression(string identifier, AstLocation location)
+		public IdentifierExpression(string identifier, TextLocation location)
 		{
 			SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (identifier, location));
 		}
@@ -52,7 +52,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/Expressions/MemberReferenceExpression.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // MemberReferenceExpression.cs
 //
 // Author:
@@ -43,7 +43,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole (Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole (Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/Expressions/NamedArgumentExpression.cs

@@ -40,7 +40,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/Expressions/NamedExpression.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // NamedExpression.cs
 //  
 // Author:
@@ -50,7 +50,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/Expressions/NullReferenceExpression.cs

@@ -31,16 +31,16 @@ namespace ICSharpCode.NRefactory.CSharp
 	/// </summary>
 	public class NullReferenceExpression : Expression
 	{
-		AstLocation location;
-		public override AstLocation StartLocation {
+		TextLocation location;
+		public override TextLocation StartLocation {
 			get {
 				return location;
 			}
 		}
 		
-		public override AstLocation EndLocation {
+		public override TextLocation EndLocation {
 			get {
-				return new AstLocation (location.Line, location.Column + "null".Length);
+				return new TextLocation (location.Line, location.Column + "null".Length);
 			}
 		}
 		
@@ -48,7 +48,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 		}
 		
-		public NullReferenceExpression (AstLocation location)
+		public NullReferenceExpression (TextLocation location)
 		{
 			this.location = location;
 		}

ICSharpCode.NRefactory.CSharp/Ast/Expressions/PointerReferenceExpression.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // PointerReferenceExpression.cs
 //  
 // Author:
@@ -45,7 +45,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/Expressions/PrimitiveExpression.cs

@@ -33,17 +33,17 @@ namespace ICSharpCode.NRefactory.CSharp
 	{
 		public static readonly object AnyValue = new object();
 		
-		AstLocation startLocation;
-		public override AstLocation StartLocation {
+		TextLocation startLocation;
+		public override TextLocation StartLocation {
 			get {
 				return startLocation;
 			}
 		}
 		
 		string literalValue;
-		public override AstLocation EndLocation {
+		public override TextLocation EndLocation {
 			get {
-				return new AstLocation (StartLocation.Line, StartLocation.Column + literalValue.Length);
+				return new TextLocation (StartLocation.Line, StartLocation.Column + literalValue.Length);
 			}
 		}
 		
@@ -69,7 +69,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			this.literalValue = literalValue ?? "";
 		}
 		
-		public PrimitiveExpression (object value, AstLocation startLocation, string literalValue)
+		public PrimitiveExpression (object value, TextLocation startLocation, string literalValue)
 		{
 			this.Value = value;
 			this.startLocation = startLocation;
@@ -77,7 +77,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		}
 		
 		#region IRelocationable implementation
-		void IRelocatable.SetStartLocation (AstLocation startLocation)
+		void IRelocatable.SetStartLocation (TextLocation startLocation)
 		{
 			this.startLocation = startLocation;
 		}

ICSharpCode.NRefactory.CSharp/Ast/Expressions/QueryExpression.cs

@@ -104,7 +104,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		
@@ -139,7 +139,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		
@@ -176,7 +176,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole(Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, CSharp.Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		
@@ -264,7 +264,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole(JoinIdentifierRole).Name;
 			}
 			set {
-				SetChildByRole(JoinIdentifierRole, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(JoinIdentifierRole, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		
@@ -308,7 +308,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (IntoIdentifierRole).Name;
 			}
 			set {
-				SetChildByRole(IntoIdentifierRole, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(IntoIdentifierRole, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/Expressions/ThisReferenceExpression.cs

@@ -31,19 +31,19 @@ namespace ICSharpCode.NRefactory.CSharp
 	/// </summary>
 	public class ThisReferenceExpression : Expression
 	{
-		public AstLocation Location {
+		public TextLocation Location {
 			get;
 			set;
 		}
 		
-		public override AstLocation StartLocation {
+		public override TextLocation StartLocation {
 			get {
 				return Location;
 			}
 		}
-		public override AstLocation EndLocation {
+		public override TextLocation EndLocation {
 			get {
-				return new AstLocation (Location.Line, Location.Column + "this".Length);
+				return new TextLocation (Location.Line, Location.Column + "this".Length);
 			}
 		}
 

ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/Comment.cs

@@ -55,15 +55,15 @@ namespace ICSharpCode.NRefactory.CSharp
 			set;
 		}
 		
-		AstLocation startLocation;
-		public override AstLocation StartLocation {
+		TextLocation startLocation;
+		public override TextLocation StartLocation {
 			get { 
 				return startLocation;
 			}
 		}
 		
-		AstLocation endLocation;
-		public override AstLocation EndLocation {
+		TextLocation endLocation;
+		public override TextLocation EndLocation {
 			get {
 				return endLocation;
 			}
@@ -75,7 +75,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			this.Content = content;
 		}
 		
-		public Comment (CommentType commentType, AstLocation startLocation, AstLocation endLocation)
+		public Comment (CommentType commentType, TextLocation startLocation, TextLocation endLocation)
 		{
 			this.CommentType = commentType;
 			this.startLocation = startLocation;
@@ -83,10 +83,10 @@ namespace ICSharpCode.NRefactory.CSharp
 		}
 		
 		#region IRelocationable implementation
-		void IRelocatable.SetStartLocation (AstLocation startLocation)
+		void IRelocatable.SetStartLocation (TextLocation startLocation)
 		{
 			int lineDelta = startLocation.Line - this.startLocation.Line;
-			endLocation = new AstLocation (endLocation.Line + lineDelta, lineDelta != 0 ? endLocation.Column : endLocation.Column + startLocation.Column - this.startLocation.Column);
+			endLocation = new TextLocation (endLocation.Line + lineDelta, lineDelta != 0 ? endLocation.Column : endLocation.Column + startLocation.Column - this.startLocation.Column);
 			this.startLocation = startLocation;
 		}
 		#endregion

ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/Constraint.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // Constraint.cs
 //
 // Author:
@@ -50,7 +50,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/DelegateDeclaration.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // DelegateDeclaration.cs
 //
 // Author:
@@ -50,7 +50,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole (Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole (Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/ExternAliasDeclaration.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // ExternAliasDeclaration.cs
 //  
 // Author:
@@ -52,7 +52,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole (Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole (Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NamespaceDeclaration.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // NamespaceDeclaration.cs
 //  
 // Author:
@@ -54,7 +54,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return builder.ToString ();
 			}
 			set {
-				GetChildrenByRole(Roles.Identifier).ReplaceWith(value.Split('.').Select(ident => Identifier.Create (ident, AstLocation.Empty)));
+				GetChildrenByRole(Roles.Identifier).ReplaceWith(value.Split('.').Select(ident => Identifier.Create (ident, TextLocation.Empty)));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeDeclaration.cs

@@ -63,7 +63,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole (Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole (Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeParameterDeclaration.cs

@@ -50,7 +50,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/UsingAliasDeclaration.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // UsingAliasDeclaration.cs
 //  
 // Author:
@@ -49,7 +49,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (AliasRole).Name;
 			}
 			set {
-				SetChildByRole(AliasRole, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(AliasRole, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		
@@ -72,13 +72,13 @@ namespace ICSharpCode.NRefactory.CSharp
 		
 		public UsingAliasDeclaration (string alias, string nameSpace)
 		{
-			AddChild (Identifier.Create (alias, AstLocation.Empty), AliasRole);
+			AddChild (Identifier.Create (alias, TextLocation.Empty), AliasRole);
 			AddChild (new SimpleType (nameSpace), ImportRole);
 		}
 		
 		public UsingAliasDeclaration (string alias, AstType import)
 		{
-			AddChild (Identifier.Create (alias, AstLocation.Empty), AliasRole);
+			AddChild (Identifier.Create (alias, TextLocation.Empty), AliasRole);
 			AddChild (import, ImportRole);
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/IRelocatable.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // IRelocationable.cs
 //  
 // Author:
@@ -29,7 +29,7 @@ namespace ICSharpCode.NRefactory.CSharp
 {
 	public interface IRelocatable
 	{
-		void SetStartLocation (AstLocation startLocation);
+		void SetStartLocation (TextLocation startLocation);
 	}
 }
 

ICSharpCode.NRefactory.CSharp/Ast/Identifier.cs

@@ -66,8 +66,8 @@ namespace ICSharpCode.NRefactory.CSharp
 			}
 		}
 		
-		AstLocation startLocation;
-		public override AstLocation StartLocation {
+		TextLocation startLocation;
+		public override TextLocation StartLocation {
 			get {
 				return startLocation;
 			}
@@ -81,15 +81,15 @@ namespace ICSharpCode.NRefactory.CSharp
 		}
 		
 		#region IRelocationable implementation
-		void IRelocatable.SetStartLocation (AstLocation startLocation)
+		void IRelocatable.SetStartLocation (TextLocation startLocation)
 		{
 			this.startLocation = startLocation;
 		}
 		#endregion
 		
-		public override AstLocation EndLocation {
+		public override TextLocation EndLocation {
 			get {
-				return new AstLocation (StartLocation.Line, StartLocation.Column + (Name ?? "").Length);
+				return new TextLocation (StartLocation.Line, StartLocation.Column + (Name ?? "").Length);
 			}
 		}
 		
@@ -98,7 +98,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			this.name = string.Empty;
 		}
 		
-		protected Identifier (string name, AstLocation location)
+		protected Identifier (string name, TextLocation location)
 		{
 			if (name == null)
 				throw new ArgumentNullException("name");
@@ -108,10 +108,10 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		public static Identifier Create (string name)
 		{
-			return Create (name, AstLocation.Empty);
+			return Create (name, TextLocation.Empty);
 		}
 
-		public static Identifier Create (string name, AstLocation location)
+		public static Identifier Create (string name, TextLocation location)
 		{
 			if (name == null)
 				throw new ArgumentNullException("name");
@@ -120,7 +120,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			return new Identifier (name, location);
 		}
 		
-		public static Identifier Create (string name, AstLocation location, bool isVerbatim)
+		public static Identifier Create (string name, TextLocation location, bool isVerbatim)
 		{
 			if (name == null)
 				throw new ArgumentNullException("name");
@@ -143,9 +143,9 @@ namespace ICSharpCode.NRefactory.CSharp
 
 		class VerbatimIdentifier : Identifier
 		{
-			public override AstLocation EndLocation {
+			public override TextLocation EndLocation {
 				get {
-					return new AstLocation (StartLocation.Line, StartLocation.Column + (Name ?? "").Length + 1); // @"..."
+					return new TextLocation (StartLocation.Line, StartLocation.Column + (Name ?? "").Length + 1); // @"..."
 				}
 			}
 			
@@ -155,7 +155,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				}
 			}
 			
-			public VerbatimIdentifier(string name, AstLocation location) : base (name, location)
+			public VerbatimIdentifier(string name, TextLocation location) : base (name, location)
 			{
 			}
 		}

ICSharpCode.NRefactory.CSharp/Ast/IdentifierExpressionBackreference.cs

@@ -0,0 +1,54 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER 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 System.Linq;
+using ICSharpCode.NRefactory.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp
+{
+	/// <summary>
+	/// Matches identifier expressions that have the same identifier as the referenced variable/type definition/method definition.
+	/// </summary>
+	public class IdentifierExpressionBackreference : Pattern
+	{
+		readonly string referencedGroupName;
+		
+		public string ReferencedGroupName {
+			get { return referencedGroupName; }
+		}
+		
+		public IdentifierExpressionBackreference(string referencedGroupName)
+		{
+			if (referencedGroupName == null)
+				throw new ArgumentNullException("referencedGroupName");
+			this.referencedGroupName = referencedGroupName;
+		}
+		
+		public override bool DoMatch(INode other, Match match)
+		{
+			CSharp.IdentifierExpression ident = other as CSharp.IdentifierExpression;
+			if (ident == null || ident.TypeArguments.Any())
+				return false;
+			CSharp.AstNode referenced = (CSharp.AstNode)match.Get(referencedGroupName).Last();
+			if (referenced == null)
+				return false;
+			return ident.Identifier == referenced.GetChildByRole(CSharp.AstNode.Roles.Identifier).Name;
+		}
+	}
+}

ICSharpCode.NRefactory.CSharp/Ast/MemberType.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // FullTypeName.cs
 //
 // Author:
@@ -47,7 +47,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole (Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole (Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		
@@ -109,7 +109,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			b.Append(this.MemberName);
 			if (this.TypeArguments.Any()) {
 				b.Append('<');
-				b.Append(DotNet35Compat.StringJoin(", ", this.TypeArguments));
+				b.Append(string.Join(", ", this.TypeArguments));
 				b.Append('>');
 			}
 			return b.ToString();

ICSharpCode.NRefactory.CSharp/Ast/PrimitiveType.cs

@@ -32,7 +32,7 @@ namespace ICSharpCode.NRefactory.CSharp
 	public class PrimitiveType : AstType, IRelocatable
 	{
 		public string Keyword { get; set; }
-		public AstLocation Location { get; set; }
+		public TextLocation Location { get; set; }
 		
 		public PrimitiveType()
 		{
@@ -43,26 +43,26 @@ namespace ICSharpCode.NRefactory.CSharp
 			this.Keyword = keyword;
 		}
 		
-		public PrimitiveType(string keyword, AstLocation location)
+		public PrimitiveType(string keyword, TextLocation location)
 		{
 			this.Keyword = keyword;
 			this.Location = location;
 		}
 		
-		public override AstLocation StartLocation {
+		public override TextLocation StartLocation {
 			get {
 				return Location;
 			}
 		}
-		public override AstLocation EndLocation {
+		public override TextLocation EndLocation {
 			get {
-				return new AstLocation (Location.Line, Location.Column + (Keyword != null ? Keyword.Length : 0));
+				return new TextLocation (Location.Line, Location.Column + (Keyword != null ? Keyword.Length : 0));
 			}
 		}
 		
 		
 		#region IRelocationable implementation
-		void IRelocatable.SetStartLocation (AstLocation startLocation)
+		void IRelocatable.SetStartLocation (TextLocation startLocation)
 		{
 			this.Location = startLocation;
 		}

ICSharpCode.NRefactory.CSharp/Ast/SimpleType.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // FullTypeName.cs
 //
 // Author:
@@ -42,7 +42,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			this.Identifier = identifier;
 		}
 		
-		public SimpleType(string identifier, AstLocation location)
+		public SimpleType(string identifier, TextLocation location)
 		{
 			SetChildByRole (Roles.Identifier, CSharp.Identifier.Create (identifier, location));
 		}
@@ -64,7 +64,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole (Roles.Identifier, CSharp.Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole (Roles.Identifier, CSharp.Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		
@@ -97,7 +97,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			StringBuilder b = new StringBuilder(this.Identifier);
 			if (this.TypeArguments.Any()) {
 				b.Append('<');
-				b.Append(DotNet35Compat.StringJoin(", ", this.TypeArguments));
+				b.Append(string.Join(", ", this.TypeArguments));
 				b.Append('>');
 			}
 			return b.ToString();

ICSharpCode.NRefactory.CSharp/Ast/Statements/EmptyStatement.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // EmptyStatement.cs
 //  
 // Author:
@@ -31,25 +31,25 @@ namespace ICSharpCode.NRefactory.CSharp
 	/// </summary>
 	public class EmptyStatement : Statement, IRelocatable
 	{
-		public AstLocation Location {
+		public TextLocation Location {
 			get;
 			set;
 		}
 		
-		public override AstLocation StartLocation {
+		public override TextLocation StartLocation {
 			get {
 				return Location;
 			}
 		}
 		
-		public override AstLocation EndLocation {
+		public override TextLocation EndLocation {
 			get {
-				return new AstLocation (Location.Line, Location.Column);
+				return new TextLocation (Location.Line, Location.Column);
 			}
 		}
 		
 		#region IRelocationable implementation
-		void IRelocatable.SetStartLocation (AstLocation startLocation)
+		void IRelocatable.SetStartLocation (TextLocation startLocation)
 		{
 			this.Location = startLocation;
 		}

ICSharpCode.NRefactory.CSharp/Ast/Statements/ForeachStatement.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // ForeachStatement.cs
 //
 // Author:
@@ -49,7 +49,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/Statements/GotoStatement.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // GotoStatement.cs
 //
 // Author:
@@ -52,7 +52,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				if (string.IsNullOrEmpty(value))
 					SetChildByRole(Roles.Identifier, null);
 				else
-					SetChildByRole(Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+					SetChildByRole(Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/Statements/LabelStatement.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // LabelStatement.cs
 //
 // Author:
@@ -36,7 +36,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				return GetChildByRole (Roles.Identifier).Name;
 			}
 			set {
-				SetChildByRole(Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+				SetChildByRole(Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/Statements/TryCatchStatement.cs

@@ -1,4 +1,4 @@
-// 
+// 
 // TryCatchStatement.cs
 //
 // Author:
@@ -140,7 +140,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				if (string.IsNullOrEmpty(value))
 					SetChildByRole (Roles.Identifier, null);
 				else
-					SetChildByRole (Roles.Identifier, Identifier.Create (value, AstLocation.Empty));
+					SetChildByRole (Roles.Identifier, Identifier.Create (value, TextLocation.Empty));
 			}
 		}
 		

ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/AttributedNode.cs

@@ -57,7 +57,7 @@ namespace ICSharpCode.NRefactory.CSharp
 				if ((m & newValue) != 0) {
 					if ((m & oldValue) == 0) {
 						// Modifier was added
-						var newToken = new CSharpModifierToken(AstLocation.Empty, m);
+						var newToken = new CSharpModifierToken(TextLocation.Empty, m);
 						node.InsertChildAfter(insertionPos, newToken, ModifierRole);
 						insertionPos = newToken;
 					} else {