summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesonbuild/mformat.py2
-rw-r--r--test cases/format/5 transform/default.expected.meson13
-rw-r--r--test cases/format/5 transform/muon.expected.meson13
-rw-r--r--test cases/format/5 transform/options.expected.meson13
-rw-r--r--test cases/format/5 transform/source.meson13
5 files changed, 53 insertions, 1 deletions
diff --git a/mesonbuild/mformat.py b/mesonbuild/mformat.py
index 1bf7effd9..184a9d31f 100644
--- a/mesonbuild/mformat.py
+++ b/mesonbuild/mformat.py
@@ -371,7 +371,7 @@ class TrimWhitespaces(FullAstVisitor):
if node.is_fstring and '@' not in node.value:
node.is_fstring = False
- self.exit_node(node)
+ node.whitespaces.accept(self)
def visit_UnaryOperatorNode(self, node: mparser.UnaryOperatorNode) -> None:
super().visit_UnaryOperatorNode(node)
diff --git a/test cases/format/5 transform/default.expected.meson b/test cases/format/5 transform/default.expected.meson
index 702ae5643..91b3bc239 100644
--- a/test cases/format/5 transform/default.expected.meson
+++ b/test cases/format/5 transform/default.expected.meson
@@ -94,4 +94,17 @@ if true
endif
endif
+# issue #15019
+if get_option('client')
+ sources += files(
+ 'pypaste/client/__init__.py',
+ 'pypaste/client/__main__.py',
+ 'pypaste/client/plugins/__init__.py',
+ 'pypaste/client/plugins/pgz/__init__.py',
+ 'pypaste/client/plugins/zen/__init__.py',
+ )
+
+ dependencies += ['requests']
+endif
+
# no final endline
diff --git a/test cases/format/5 transform/muon.expected.meson b/test cases/format/5 transform/muon.expected.meson
index f01849734..e7d461012 100644
--- a/test cases/format/5 transform/muon.expected.meson
+++ b/test cases/format/5 transform/muon.expected.meson
@@ -94,4 +94,17 @@ if true
endif
endif
+# issue #15019
+if get_option('client')
+ sources += files(
+ 'pypaste/client/__init__.py',
+ 'pypaste/client/__main__.py',
+ 'pypaste/client/plugins/__init__.py',
+ 'pypaste/client/plugins/zen/__init__.py',
+ 'pypaste/client/plugins/pgz/__init__.py',
+ )
+
+ dependencies += ['requests']
+endif
+
# no final endline
diff --git a/test cases/format/5 transform/options.expected.meson b/test cases/format/5 transform/options.expected.meson
index 7136506c0..756c226f5 100644
--- a/test cases/format/5 transform/options.expected.meson
+++ b/test cases/format/5 transform/options.expected.meson
@@ -62,4 +62,17 @@ if true
endif
endif
+# issue #15019
+if get_option('client')
+ sources += files(
+ 'pypaste/client/__init__.py',
+ 'pypaste/client/__main__.py',
+ 'pypaste/client/plugins/__init__.py',
+ 'pypaste/client/plugins/pgz/__init__.py',
+ 'pypaste/client/plugins/zen/__init__.py',
+ )
+
+ dependencies += [ 'requests' ]
+endif
+
# no final endline \ No newline at end of file
diff --git a/test cases/format/5 transform/source.meson b/test cases/format/5 transform/source.meson
index 554b9e6a7..a4004125b 100644
--- a/test cases/format/5 transform/source.meson
+++ b/test cases/format/5 transform/source.meson
@@ -50,4 +50,17 @@ if true
endif
endif
+# issue #15019
+if get_option('client')
+ sources += files(
+ 'pypaste/client/__init__.py',
+ 'pypaste/client/__main__.py',
+ 'pypaste/client/plugins/__init__.py',
+ 'pypaste/client/plugins/zen/__init__.py',
+ 'pypaste/client/plugins/pgz/__init__.py'
+ )
+
+ dependencies += ['requests']
+endif
+
# no final endline \ No newline at end of file