git-clang-format

google · Oct 1, 2024 · bac0775 · bac0775
1 parent 9e0ca84
commit bac0775
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/xls/dslx/frontend/parser.cc b/xls/dslx/frontend/parser.cc
@@ -332,7 +332,8 @@ absl::StatusOr<std::unique_ptr<Module>> Parser::ParseModule(
         XLS_ASSIGN_OR_RETURN(ConstantDef * constant_def,
                              ParseConstantDef(/*is_public=*/true, *bindings));
         constant_def->SetParentNonLexical(module_.get());
-        XLS_RETURN_IF_ERROR(module_->AddTop(constant_def, make_collision_error));
+        XLS_RETURN_IF_ERROR(
+            module_->AddTop(constant_def, make_collision_error));
         continue;
       }
 

diff --git a/xls/dslx/lsp/language_server_adapter.cc b/xls/dslx/lsp/language_server_adapter.cc
@@ -337,10 +337,8 @@ LanguageServerAdapter::PrepareRename(
 // Implementation note: since `name_def` does not currently have "use" links
 // maintained, this is linear in the number of nodes in `container`.
 static absl::Status RenameInGeneric(
-    const AstNode& container,
-    const NameDef& name_def,
-    std::string_view new_name,
-    std::vector<verible::lsp::TextEdit>& edits) {
+    const AstNode& container, const NameDef& name_def,
+    std::string_view new_name, std::vector<verible::lsp::TextEdit>& edits) {
   // Get all the references to the name def and rename them all.
   XLS_ASSIGN_OR_RETURN(std::vector<const NameRef*> name_refs,
                        CollectNameRefsUnder(&container, &name_def));
@@ -357,17 +355,18 @@ static absl::Status RenameInGeneric(
 //
 // We do a check to see if it's a public member, in which case renames across
 // file boundaries (i.e. outside this file) may be required.
-static absl::Status RenameInModule(
-    const Module& module,
-    const NameDef& name_def,
-    std::string_view new_name,
-    std::vector<verible::lsp::TextEdit>& edits) {
+static absl::Status RenameInModule(const Module& module,
+                                   const NameDef& name_def,
+                                   std::string_view new_name,
+                                   std::vector<verible::lsp::TextEdit>& edits) {
   // If the definer is a 'pub' module member then we may need to rename across
   // files, so we say we can't do that.
   const AstNode* definer = name_def.definer();
   if (definer != nullptr && module.IsPublicMember(*definer)) {
-    return absl::UnimplementedError(absl::StrFormat(
-          "Module member `%s` is public, and so may require renames across files, which is not yet supported.", name_def.identifier()));
+    return absl::UnimplementedError(
+        absl::StrFormat("Module member `%s` is public, and so may require "
+                        "renames across files, which is not yet supported.",
+                        name_def.identifier()));
   }
 
   return RenameInGeneric(module, name_def, new_name, edits);
@@ -387,7 +386,8 @@ LanguageServerAdapter::Rename(std::string_view uri,
     xls::dslx::FindDefinition(parsed->module(), pos, parsed->type_info(),
                               parsed->import_data, &name_def);
     if (name_def == nullptr) {
-      VLOG(1) << "No definition found for attempted rename to: `" << new_name << "`";
+      VLOG(1) << "No definition found for attempted rename to: `" << new_name
+              << "`";
       return std::nullopt;
     }
 
@@ -402,18 +402,21 @@ LanguageServerAdapter::Rename(std::string_view uri,
     const AstNode* node = name_def;
     while (true) {
       node = node->parent();
-      VLOG(3) << absl::StreamFormat("Traversed to parent AST node: `%s`", node->ToString());
+      VLOG(3) << absl::StreamFormat("Traversed to parent AST node: `%s`",
+                                    node->ToString());
       if (node == nullptr) {
         return std::nullopt;
       }
       if (node->kind() == AstNodeKind::kFunction) {
         const auto* function = down_cast<const Function*>(node);
-        XLS_RETURN_IF_ERROR(RenameInGeneric(*function, *name_def, new_name, edits));
+        XLS_RETURN_IF_ERROR(
+            RenameInGeneric(*function, *name_def, new_name, edits));
         break;
       }
       if (node->kind() == AstNodeKind::kModule) {
         const auto* module = down_cast<const Module*>(node);
-        XLS_RETURN_IF_ERROR(RenameInModule(*module, *name_def, new_name, edits));
+        XLS_RETURN_IF_ERROR(
+            RenameInModule(*module, *name_def, new_name, edits));
         break;
       }
     }

diff --git a/xls/dslx/lsp/language_server_adapter_test.cc b/xls/dslx/lsp/language_server_adapter_test.cc
@@ -345,9 +345,8 @@ const BAR: u32 = FOO + FOO;)"));
 
   // See what edits come out.
   absl::StatusOr<std::optional<verible::lsp::WorkspaceEdit>> edit =
-                           adapter.Rename(kUri, kWantRange.start, "FT");
-  EXPECT_THAT(edit,
-              StatusIs(absl::StatusCode::kUnimplemented));
+      adapter.Rename(kUri, kWantRange.start, "FT");
+  EXPECT_THAT(edit, StatusIs(absl::StatusCode::kUnimplemented));
 }
 
 }  // namespace