commit 83ae2cec69ec54b85670f61998f592b6801d3fda
author Brandon Jones <bajones@chromium.org> Fri Apr 30 20:45:58 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri Apr 30 20:45:58 2021 +0000
tree edee2ebe99df5faff555ee176cbe1e13b6c1dff4
parent 4043ee9c06239defeea4389f51110a7ca8afd368

Added offset and length to CompilationMessage

Bug: dawn:746
Change-Id: I1811832f63a42121dfb67acb87b0b593000a90a1
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/49504
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Brandon Jones <bajones@chromium.org>

dawn.json

diff --git a/dawn.json b/dawn.json
index be0062c..6eb388c 100644
--- a/dawn.json
+++ b/dawn.json
@@ -540,7 +540,9 @@
             {"name": "message", "type": "char", "annotation": "const*", "length": "strlen", "optional": true},
             {"name": "type", "type": "compilation message type"},
             {"name": "line num", "type": "uint64_t"},
-            {"name": "line pos", "type": "uint64_t"}
+            {"name": "line pos", "type": "uint64_t"},
+            {"name": "offset", "type": "uint64_t"},
+            {"name": "length", "type": "uint64_t"}
         ]
     },
     "compilation message type": {

src/dawn_native/CompilationMessages.cpp

diff --git a/src/dawn_native/CompilationMessages.cpp b/src/dawn_native/CompilationMessages.cpp
index f319654..8e1b79c 100644
--- a/src/dawn_native/CompilationMessages.cpp
+++ b/src/dawn_native/CompilationMessages.cpp
@@ -44,27 +44,64 @@
     void OwnedCompilationMessages::AddMessage(std::string message,
                                               wgpu::CompilationMessageType type,
                                               uint64_t lineNum,
-                                              uint64_t linePos) {
+                                              uint64_t linePos,
+                                              uint64_t offset,
+                                              uint64_t length) {
         // Cannot add messages after GetCompilationInfo has been called.
         ASSERT(mCompilationInfo.messages == nullptr);
 
         mMessageStrings.push_back(message);
-        mMessages.push_back(
-            {nullptr, static_cast<WGPUCompilationMessageType>(type), lineNum, linePos});
+        mMessages.push_back({nullptr, static_cast<WGPUCompilationMessageType>(type), lineNum,
+                             linePos, offset, length});
     }
 
     void OwnedCompilationMessages::AddMessage(const tint::diag::Diagnostic& diagnostic) {
         // Cannot add messages after GetCompilationInfo has been called.
         ASSERT(mCompilationInfo.messages == nullptr);
 
+        // Tint line and column values are 1-based.
+        uint64_t lineNum = diagnostic.source.range.begin.line;
+        uint64_t linePos = diagnostic.source.range.begin.column;
+        // The offset is 0-based.
+        uint64_t offset = 0;
+        uint64_t length = 0;
+
+        if (lineNum && linePos && diagnostic.source.file_content) {
+            const std::vector<std::string>& lines = diagnostic.source.file_content->lines;
+            size_t i = 0;
+            // To find the offset of the message position, loop through each of the first lineNum-1
+            // lines and add it's length (+1 to account for the line break) to the offset.
+            for (; i < lineNum - 1; ++i) {
+                offset += lines[i].length() + 1;
+            }
+
+            // If the end line is on a different line from the beginning line, add the length of the
+            // lines in between to the ending offset.
+            uint64_t endLineNum = diagnostic.source.range.end.line;
+            uint64_t endLinePos = diagnostic.source.range.end.column;
+            uint64_t endOffset = offset;
+            for (; i < endLineNum - 1; ++i) {
+                endOffset += lines[i].length() + 1;
+            }
+
+            // Add the line positions to the offset and endOffset to get their final positions
+            // within the code string.
+            offset += linePos - 1;
+            endOffset += endLinePos - 1;
+
+            // The length of the message is the difference between the starting offset and the
+            // ending offset.
+            length = endOffset - offset;
+        }
+
         if (diagnostic.code) {
             mMessageStrings.push_back(std::string(diagnostic.code) + ": " + diagnostic.message);
         } else {
             mMessageStrings.push_back(diagnostic.message);
         }
-        mMessages.push_back({nullptr, tintSeverityToMessageType(diagnostic.severity),
-                             diagnostic.source.range.begin.line,
-                             diagnostic.source.range.begin.column});
+
+        mMessages.push_back({nullptr, tintSeverityToMessageType(diagnostic.severity), lineNum,
+                             linePos, offset, length});
     }
 
     void OwnedCompilationMessages::AddMessages(const tint::diag::List& diagnostics) {

src/dawn_native/CompilationMessages.h

diff --git a/src/dawn_native/CompilationMessages.h b/src/dawn_native/CompilationMessages.h
index 02c449d..8a681e6 100644
--- a/src/dawn_native/CompilationMessages.h
+++ b/src/dawn_native/CompilationMessages.h
@@ -37,7 +37,9 @@
         void AddMessage(std::string message,
                         wgpu::CompilationMessageType type = wgpu::CompilationMessageType::Info,
                         uint64_t lineNum = 0,
-                        uint64_t linePos = 0);
+                        uint64_t linePos = 0,
+                        uint64_t offset = 0,
+                        uint64_t length = 0);
         void AddMessage(const tint::diag::Diagnostic& diagnostic);
         void AddMessages(const tint::diag::List& diagnostics);
         void ClearMessages();