From 369279e91dde1b056d8d0e3bb83e7ba3f96321af Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Fri, 12 Feb 2021 14:31:56 -0500
Subject: Diagnostic location highlighting (#1700)

* #include an absolute path didn't work - because paths were taken to always be relative.

* WIP: First pass in supporting output of line error information.

* Add support for lexing to better be able to indicate SourceLocation information.

* Fix lexer usage in DiagnosticSink in C++ extractor.

* Update diagnostics tests to have line location info.

* Fixed test expected output that now have source location information in them.

* Better handling of tab.

* Fix test expected results for tabbing change.

* DiagnosticLexer -> DiagnosticSink::SourceLocationLexer
Added line continuation tests.

* Fix typo.

* Added String::appendRepeatedChar

* Change to rerun tests.

Co-authored-by: Tim Foley <tfoleyNV@users.noreply.github.com>
---
 source/slang/slang-lexer.cpp | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'source/slang/slang-lexer.cpp')

diff --git a/source/slang/slang-lexer.cpp b/source/slang/slang-lexer.cpp
index fe268223d..b0146c5b0 100644
--- a/source/slang/slang-lexer.cpp
+++ b/source/slang/slang-lexer.cpp
@@ -1339,4 +1339,40 @@ namespace Slang
                 return tokenList;
         }
     }
+
+    /* static */UnownedStringSlice Lexer::sourceLocationLexer(const UnownedStringSlice& in)
+    {
+        Lexer lexer;
+
+        SourceManager sourceManager;
+        sourceManager.initialize(nullptr, nullptr);
+
+        auto sourceFile = sourceManager.createSourceFileWithString(PathInfo::makeUnknown(), in);
+        auto sourceView = sourceManager.createSourceView(sourceFile, nullptr, SourceLoc::fromRaw(0));
+
+        DiagnosticSink sink(&sourceManager, nullptr);
+
+        MemoryArena arena;
+
+        RootNamePool rootNamePool;
+        NamePool namePool;
+        namePool.setRootNamePool(&rootNamePool);
+
+        lexer.initialize(sourceView, &sink, &namePool, &arena);
+
+        Token tok = lexer.lexToken();
+
+        if (tok.type == TokenType::Invalid)
+        {
+            return UnownedStringSlice();
+        }
+
+        const int offset = sourceView->getRange().getOffset(tok.loc);
+
+        SLANG_ASSERT(offset >= 0 && offset <= in.getLength());
+        SLANG_ASSERT(Index(offset + tok.charsCount) <= in.getLength());
+
+        return UnownedStringSlice(in.begin() + offset, in.begin() + offset + tok.charsCount);
+    }
+
 }
-- 
cgit v1.2.3