handel merge conflict, use refPos instead of start

This commit is contained in:
Mohamed Hegazy
2015-08-13 12:45:26 -07:00
parent 94fa6b92b4
commit fdda66f055

View File

@@ -406,7 +406,7 @@ namespace ts {
if (diagnostic) {
if (refFile !== undefined && refEnd !== undefined && refPos !== undefined) {
diagnostics.add(createFileDiagnostic(refFile, start, refEnd - refPos, diagnostic, ...diagnosticArgument));
diagnostics.add(createFileDiagnostic(refFile, refPos, refEnd - refPos, diagnostic, ...diagnosticArgument));
}
else {
diagnostics.add(createCompilerDiagnostic(diagnostic, ...diagnosticArgument));