From f9fa8d8e6695d47c537dc6939bd6886897211ff6 Mon Sep 17 00:00:00 2001 From: Turiiya <34311583+ttytm@users.noreply.github.com> Date: Wed, 3 Apr 2024 19:58:22 +0200 Subject: [PATCH] fmt: fix duplicates remove import comments (#21177) --- vlib/v/fmt/fmt.v | 1 + vlib/v/fmt/tests/import_duplicate_expected.vv | 1 + vlib/v/fmt/tests/import_duplicate_input.vv | 1 + 3 files changed, 3 insertions(+) diff --git a/vlib/v/fmt/fmt.v b/vlib/v/fmt/fmt.v index 98ac0f03e895ea..183b33c12cbec2 100644 --- a/vlib/v/fmt/fmt.v +++ b/vlib/v/fmt/fmt.v @@ -343,6 +343,7 @@ pub fn (mut f Fmt) imports(imports []ast.Import) { imp_stmt := f.imp_stmt_str(imp) if imp_stmt in processed_imports { // Skip duplicates. + f.import_comments(imp.next_comments) continue } processed_imports[imp_stmt] = true diff --git a/vlib/v/fmt/tests/import_duplicate_expected.vv b/vlib/v/fmt/tests/import_duplicate_expected.vv index a5780194cacb1d..ec7f14e4322ee1 100644 --- a/vlib/v/fmt/tests/import_duplicate_expected.vv +++ b/vlib/v/fmt/tests/import_duplicate_expected.vv @@ -1,5 +1,6 @@ import math import os +// keep comment import gg import gg { MouseButton } import time diff --git a/vlib/v/fmt/tests/import_duplicate_input.vv b/vlib/v/fmt/tests/import_duplicate_input.vv index 2e24f21eac35b4..2d248cb4823817 100644 --- a/vlib/v/fmt/tests/import_duplicate_input.vv +++ b/vlib/v/fmt/tests/import_duplicate_input.vv @@ -1,6 +1,7 @@ import math import os import math +// keep comment import gg import gg { MouseButton } import time { Duration }