Check if this is an import statement instead

llvm · Sep 21, 2023 · 23d1b3c · 23d1b3c
1 parent a956ea3
commit 23d1b3c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp
@@ -2270,14 +2270,17 @@ ContinuationIndenter::createBreakableToken(const FormatToken &Current,
     if (State.Stack.back().IsInsideObjCArrayLiteral)
       return nullptr;
 
-    // The "DPI" (or "DPI-C") in SystemVerilog direct programming interface
-    // imports cannot be split, e.g.
+    // The "DPI"/"DPI-C" in SystemVerilog direct programming interface imports
+    // cannot be split, e.g.
     // `import "DPI" function foo();`
-    // FIXME: We should see if this is an import statement instead of hardcoding
-    // "DPI"/"DPI-C".
     StringRef Text = Current.TokenText;
-    if (Style.isVerilog() && (Text == "\"DPI\"" || Text == "\"DPI-C\""))
-      return nullptr;
+    if (Style.isVerilog()) {
+      const FormatToken *Prev = Current.getPreviousNonComment();
+      if (Prev && Prev == State.Line->getFirstNonComment() &&
+          Prev->TokenText == "import") {
+        return nullptr;
+      }
+    }
 
     // We need this to address the case where there is an unbreakable tail only
     // if certain other formatting decisions have been taken. The

diff --git a/clang/unittests/Format/FormatTestVerilog.cpp b/clang/unittests/Format/FormatTestVerilog.cpp
@@ -1253,7 +1253,7 @@ TEST_F(FormatTestVerilog, StringLiteral) {
    "xxxx"});)",
                R"(x({"xxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxx ", "xxxx"});)",
                getStyleWithColumns(getDefaultStyle(), 23));
-  // "DPI"/"DPI-C" in imports cannot be split.
+  // import "DPI"/"DPI-C" cannot be split.
   verifyFormat(R"(import
     "DPI-C" function t foo
     ();)",