From 97346e5644b7df53a3b4aa83f4316db2bd680799 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Sun, 26 Oct 2025 01:30:39 -0700
Subject: [PATCH] tweak

---
 esphome/components/binary_sensor/filter.h |  2 +-
 esphome/components/sensor/filter.h        |  2 +-
 esphome/components/text_sensor/filter.h   |  2 +-
 esphome/core/base_automation.h            |  4 ++--
 tests/unit_tests/test_cpp_generator.py    | 17 +++++++++++++++++
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/esphome/components/binary_sensor/filter.h b/esphome/components/binary_sensor/filter.h
index c1c54709a9..2d473c3b64 100644
--- a/esphome/components/binary_sensor/filter.h
+++ b/esphome/components/binary_sensor/filter.h
@@ -114,7 +114,7 @@ class LambdaFilter : public Filter {
 /** Optimized lambda filter for stateless lambdas (no capture).
  *
  * Uses function pointer instead of std::function to reduce memory overhead.
- * Memory: 8 bytes (function pointer) vs 32 bytes (std::function).
+ * Memory: 4 bytes (function pointer on 32-bit) vs 32 bytes (std::function).
  */
 class StatelessLambdaFilter : public Filter {
  public:
diff --git a/esphome/components/sensor/filter.h b/esphome/components/sensor/filter.h
index ebcdbb8cab..75e28a1efe 100644
--- a/esphome/components/sensor/filter.h
+++ b/esphome/components/sensor/filter.h
@@ -299,7 +299,7 @@ class LambdaFilter : public Filter {
 /** Optimized lambda filter for stateless lambdas (no capture).
  *
  * Uses function pointer instead of std::function to reduce memory overhead.
- * Memory: 8 bytes (function pointer) vs 32 bytes (std::function).
+ * Memory: 4 bytes (function pointer on 32-bit) vs 32 bytes (std::function).
  */
 class StatelessLambdaFilter : public Filter {
  public:
diff --git a/esphome/components/text_sensor/filter.h b/esphome/components/text_sensor/filter.h
index dddf1b2b34..85acac5c8d 100644
--- a/esphome/components/text_sensor/filter.h
+++ b/esphome/components/text_sensor/filter.h
@@ -65,7 +65,7 @@ class LambdaFilter : public Filter {
 /** Optimized lambda filter for stateless lambdas (no capture).
  *
  * Uses function pointer instead of std::function to reduce memory overhead.
- * Memory: 8 bytes (function pointer) vs 32 bytes (std::function).
+ * Memory: 4 bytes (function pointer on 32-bit) vs 32 bytes (std::function).
  */
 class StatelessLambdaFilter : public Filter {
  public:
diff --git a/esphome/core/base_automation.h b/esphome/core/base_automation.h
index 683be2a9e9..1c60dd1c7a 100644
--- a/esphome/core/base_automation.h
+++ b/esphome/core/base_automation.h
@@ -81,7 +81,7 @@ template<typename... Ts> class LambdaCondition : public Condition<Ts...> {
 
 /// Optimized lambda condition for stateless lambdas (no capture).
 /// Uses function pointer instead of std::function to reduce memory overhead.
-/// Memory: 8 bytes (function pointer) vs 32 bytes (std::function).
+/// Memory: 4 bytes (function pointer on 32-bit) vs 32 bytes (std::function).
 template<typename... Ts> class StatelessLambdaCondition : public Condition<Ts...> {
  public:
   explicit StatelessLambdaCondition(bool (*f)(Ts...)) : f_(f) {}
@@ -204,7 +204,7 @@ template<typename... Ts> class LambdaAction : public Action<Ts...> {
 
 /// Optimized lambda action for stateless lambdas (no capture).
 /// Uses function pointer instead of std::function to reduce memory overhead.
-/// Memory: 8 bytes (function pointer) vs 32 bytes (std::function).
+/// Memory: 4 bytes (function pointer on 32-bit) vs 32 bytes (std::function).
 template<typename... Ts> class StatelessLambdaAction : public Action<Ts...> {
  public:
   explicit StatelessLambdaAction(void (*f)(Ts...)) : f_(f) {}
diff --git a/tests/unit_tests/test_cpp_generator.py b/tests/unit_tests/test_cpp_generator.py
index b495b52064..f42ad180c7 100644
--- a/tests/unit_tests/test_cpp_generator.py
+++ b/tests/unit_tests/test_cpp_generator.py
@@ -213,6 +213,23 @@ class TestLambdaExpression:
             "+[](int32_t foo, float bar) -> float {\n  return foo + bar;\n}"
         )
 
+    def test_str__with_capture_no_prefix(self):
+        """Test lambda with capture (not stateless) does NOT get + prefix"""
+        target = cg.LambdaExpression(
+            ("return captured_var + x;",),
+            ((int, "x"),),
+            "captured_var",  # Has capture (not stateless)
+            int,
+        )
+
+        actual = str(target)
+
+        # Should NOT have + prefix
+        assert actual == (
+            "[captured_var](int32_t x) -> int32_t {\n  return captured_var + x;\n}"
+        )
+        assert not actual.startswith("+")
+
 
 class TestLiterals:
     @pytest.mark.parametrize(