From 675891ae0c3ecf884008a84162036b42759c1550 Mon Sep 17 00:00:00 2001 From: Konstantin Shcheglov Date: Mon, 24 Aug 2020 14:34:03 +0000 Subject: [PATCH] Issue 43152. Use existing LineInfo in newDiagnosticMessage(). R=brianwilkerson@google.com Bug: https://github.com/dart-lang/sdk/issues/43152 Change-Id: I1e88df0a5d2b1695b45ddfe22c84a354a9e33c4e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159741 Reviewed-by: Brian Wilkerson Commit-Queue: Konstantin Shcheglov --- pkg/analysis_server/lib/src/protocol_server.dart | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkg/analysis_server/lib/src/protocol_server.dart b/pkg/analysis_server/lib/src/protocol_server.dart index 391b46b2d64..1e68c39b55f 100644 --- a/pkg/analysis_server/lib/src/protocol_server.dart +++ b/pkg/analysis_server/lib/src/protocol_server.dart @@ -152,16 +152,11 @@ DiagnosticMessage newDiagnosticMessage( var file = message.filePath; var offset = message.offset; var length = message.length; - var startLine = -1; - var startColumn = -1; - var lineInfo = result.session.getFile(file).lineInfo; - if (lineInfo != null) { - CharacterLocation lineLocation = lineInfo.getLocation(offset); - if (lineLocation != null) { - startLine = lineLocation.lineNumber; - startColumn = lineLocation.columnNumber; - } - } + + var lineLocation = result.lineInfo.getLocation(offset); + var startLine = lineLocation.lineNumber; + var startColumn = lineLocation.columnNumber; + return DiagnosticMessage( message.message, Location(file, offset, length, startLine, startColumn)); }