Browse Source

Refactoring context now exposes the document instead of the document

like functions.
newNRvisualizers
mike 14 years ago
parent
commit
3d4550cee9
  1. 2
      ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/InsertAnonymousMethodSignature.cs
  2. 6
      ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/IntroduceFormatItem.cs
  3. 2
      ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/SplitString.cs
  4. 17
      ICSharpCode.NRefactory.CSharp/Refactoring/RefactoringContext.cs

2
ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/InsertAnonymousMethodSignature.cs

@ -60,7 +60,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring @@ -60,7 +60,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
sb.Append (")");
using (var script = context.StartScript ()) {
script.InsertText (context.GetOffset (anonymousMethodExpression.DelegateToken.EndLocation), sb.ToString ());
script.InsertText (context.Document.GetOffset (anonymousMethodExpression.DelegateToken.EndLocation), sb.ToString ());
}
}

6
ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/IntroduceFormatItem.cs

@ -92,10 +92,10 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring @@ -92,10 +92,10 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
static PrimitiveExpression CreateFormatString (RefactoringContext context, PrimitiveExpression pExpr, int argumentNumber)
{
var start = context.GetOffset (pExpr.StartLocation);
var end = context.GetOffset (pExpr.EndLocation);
var start = context.Document.GetOffset (pExpr.StartLocation);
var end = context.Document.GetOffset (pExpr.EndLocation);
return new PrimitiveExpression ("", context.GetText (start, context.SelectionStart - start) + "{" + argumentNumber + "}" + context.GetText (context.SelectionEnd, end - context.SelectionEnd));
return new PrimitiveExpression ("", context.Document.GetText (start, context.SelectionStart - start) + "{" + argumentNumber + "}" + context.Document.GetText (context.SelectionEnd, end - context.SelectionEnd));
}
}
}

2
ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/SplitString.cs

@ -47,7 +47,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring @@ -47,7 +47,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
public void Run (RefactoringContext context)
{
var pexpr = context.GetNode<PrimitiveExpression> ();
int offset = context.GetOffset (context.Location);
int offset = context.Document.GetOffset (context.Location);
using (var script = context.StartScript ()) {
script.InsertText (offset, pexpr.LiteralValue.StartsWith ("@") ? "\" + @\"" : "\" + \"");
}

17
ICSharpCode.NRefactory.CSharp/Refactoring/RefactoringContext.cs

@ -98,7 +98,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring @@ -98,7 +98,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
public virtual string EolMarker {
get { return Environment.NewLine; }
}
public virtual bool IsSomethingSelected {
get { return this.SelectionLength > 0; }
}
@ -117,20 +117,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring @@ -117,20 +117,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
get { return 0; }
}
public abstract int GetOffset (TextLocation location);
public abstract IDocumentLine GetLineByOffset (int offset);
public int GetOffset (int line, int col)
{
return GetOffset (new TextLocation (line, col));
public abstract IDocument Document {
get;
}
public abstract TextLocation GetLocation (int offset);
public abstract string GetText (int offset, int length);
public abstract string GetText (ISegment segment);
#endregion
#region Resolving

Loading…
Cancel
Save