Skip to content

Adding default string for stacktrace Word_At #38634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joperezr merged 3 commits into from
Jun 30, 2020
Merged

Adding default string for stacktrace Word_At #38634

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e62275
Adding default string for stacktrace Word_At
joperezr Jun 30, 2020
927f27f
Also adding defaults to other resources used on the stacktrace ToStri…
joperezr Jun 30, 2020
97e3f8b
Apply suggestions from code review
joperezr Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/Diagnostics/StackTrace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,11 @@ internal string ToString(TraceFormat traceFormat)

internal void ToString(TraceFormat traceFormat, StringBuilder sb)
{
string word_At = SR.Word_At;
string inFileLineNum = SR.StackTrace_InFileLineNumber;
// Passing a default string for "at" in case SR.UsingResourceKeys() is true
// as this is a special case and we don't want to have "Word_At" on stack traces.
string word_At = SR.GetResourceString(nameof(SR.Word_At), defaultString: "at");
// We also want to pass in a default for inFileLineNumber.
string inFileLineNum = SR.GetResourceString(nameof(SR.StackTrace_InFileLineNumber), defaultString: "in {0}:line {1}");
bool fFirstFrame = true;
for (int iFrameIndex = 0; iFrameIndex < _numOfFrames; iFrameIndex++)
{
Expand Down Expand Up @@ -326,7 +329,9 @@ internal void ToString(TraceFormat traceFormat, StringBuilder sb)
if (sf.IsLastFrameFromForeignExceptionStackTrace && !isAsync)
{
sb.AppendLine();
sb.Append(SR.Exception_EndStackTraceFromPreviousThrow);
// Passing default for Exception_EndStackTraceFromPreviousThrow in case SR.UsingResourceKeys is set.
sb.Append(SR.GetResourceString(nameof(SR.Exception_EndStackTraceFromPreviousThrow),
defaultString: "--- End of stack trace from previous location ---"));
}
}
}
Expand Down