diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/E501_2.py b/crates/ruff/resources/test/fixtures/pycodestyle/E501_2.py
index 18ea839392ba1..617b3ad7dc7c9 100644
--- a/crates/ruff/resources/test/fixtures/pycodestyle/E501_2.py
+++ b/crates/ruff/resources/test/fixtures/pycodestyle/E501_2.py
@@ -1,11 +1,16 @@
-a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-a	=	"""ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+# aaaa
+# aaaaa
+    # a
+	# a
+	# aa
+	# aaa
+	# aaaa
+		# a
+		# aa
+		# aaa
 
-b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-b	=	"""ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-
-c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-c	=	"""2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-
-d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-d	=	"""💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+if True: # noqa: E501
+	[12]
+	[12 ]
+	[1,2]
+	[1, 2]
diff --git a/crates/ruff/src/line_width.rs b/crates/ruff/src/line_width.rs
index a3db08416c55d..8c1844185d7e2 100644
--- a/crates/ruff/src/line_width.rs
+++ b/crates/ruff/src/line_width.rs
@@ -145,10 +145,10 @@ impl PartialOrd<LineLength> for LineWidth {
 /// The size of a tab.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, CacheKey)]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-pub struct TabSize(pub NonZeroU8);
+pub struct TabSize(NonZeroU8);
 
 impl TabSize {
-    fn as_usize(self) -> usize {
+    pub(crate) fn as_usize(self) -> usize {
         self.0.get() as usize
     }
 }
diff --git a/crates/ruff/src/rules/pycodestyle/helpers.rs b/crates/ruff/src/rules/pycodestyle/helpers.rs
index 12ae3a0a39ac7..eee48f336e9a8 100644
--- a/crates/ruff/src/rules/pycodestyle/helpers.rs
+++ b/crates/ruff/src/rules/pycodestyle/helpers.rs
@@ -52,8 +52,11 @@ pub(super) fn is_overlong(
     task_tags: &[String],
     tab_size: TabSize,
 ) -> Option<Overlong> {
-    // Each character is between 1-4 bytes. If the number of bytes is smaller than the limit, it cannot be overlong.
-    if line.len() < limit.get() {
+    // The maximum width of the line is the number of bytes multiplied by the tab size (the
+    // worst-case scenario is that the line is all tabs). If the maximum width is less than the
+    // limit, then the line is not overlong.
+    let max_width = line.len() * tab_size.as_usize();
+    if max_width < limit.get() {
         return None;
     }
 
diff --git a/crates/ruff/src/rules/pycodestyle/mod.rs b/crates/ruff/src/rules/pycodestyle/mod.rs
index 86eb5925c6d91..95495cbae70a9 100644
--- a/crates/ruff/src/rules/pycodestyle/mod.rs
+++ b/crates/ruff/src/rules/pycodestyle/mod.rs
@@ -206,6 +206,7 @@ mod tests {
             Path::new("pycodestyle/E501_2.py"),
             &settings::Settings {
                 tab_size: NonZeroU8::new(tab_size).unwrap().into(),
+                line_length: LineLength::from(6),
                 ..settings::Settings::for_rule(Rule::LineTooLong)
             },
         )?;
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_1.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_1.snap
index 46f4bc8f55512..b20cb9ecbf9f5 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_1.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_1.snap
@@ -1,56 +1,51 @@
 ---
 source: crates/ruff/src/rules/pycodestyle/mod.rs
 ---
-E501_2.py:1:81: E501 Line too long (89 > 88 characters)
+E501_2.py:2:7: E501 Line too long (7 > 6 characters)
   |
-1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+1 | # aaaa
+2 | # aaaaa
+  |       ^ E501
+3 |     # a
+4 |     # a
   |
 
-E501_2.py:2:81: E501 Line too long (89 > 88 characters)
+E501_2.py:3:7: E501 Line too long (7 > 6 characters)
   |
-1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                             ^ E501
-3 | 
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+1 | # aaaa
+2 | # aaaaa
+3 |     # a
+  |       ^ E501
+4 |     # a
+5 |     # aa
   |
 
-E501_2.py:4:81: E501 Line too long (89 > 88 characters)
+E501_2.py:7:7: E501 Line too long (7 > 6 characters)
   |
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-3 | 
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+5 |     # aa
+6 |     # aaa
+7 |     # aaaa
+  |          ^ E501
+8 |         # a
+9 |         # aa
   |
 
-E501_2.py:5:81: E501 Line too long (89 > 88 characters)
-  |
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                             ^ E501
-6 | 
-7 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |
-
-E501_2.py:7:82: E501 Line too long (89 > 88 characters)
-  |
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-6 | 
-7 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |
+E501_2.py:10:7: E501 Line too long (7 > 6 characters)
+   |
+ 8 |         # a
+ 9 |         # aa
+10 |         # aaa
+   |             ^ E501
+11 | 
+12 | if True: # noqa: E501
+   |
 
-E501_2.py:10:82: E501 Line too long (89 > 88 characters)
+E501_2.py:16:7: E501 Line too long (7 > 6 characters)
    |
- 8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
- 9 | 
-10 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-   |                                                                                         ^ E501
-11 | d   =   """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+14 |     [12 ]
+15 |     [1,2]
+16 |     [1, 2]
+   |          ^ E501
    |
 
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_2.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_2.snap
index 46f4bc8f55512..e2f7159f9c506 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_2.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_2.snap
@@ -1,56 +1,90 @@
 ---
 source: crates/ruff/src/rules/pycodestyle/mod.rs
 ---
-E501_2.py:1:81: E501 Line too long (89 > 88 characters)
+E501_2.py:2:7: E501 Line too long (7 > 6 characters)
   |
-1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+1 | # aaaa
+2 | # aaaaa
+  |       ^ E501
+3 |     # a
+4 |     # a
   |
 
-E501_2.py:2:81: E501 Line too long (89 > 88 characters)
+E501_2.py:3:7: E501 Line too long (7 > 6 characters)
   |
-1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                             ^ E501
-3 | 
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+1 | # aaaa
+2 | # aaaaa
+3 |     # a
+  |       ^ E501
+4 |     # a
+5 |     # aa
   |
 
-E501_2.py:4:81: E501 Line too long (89 > 88 characters)
+E501_2.py:6:6: E501 Line too long (7 > 6 characters)
   |
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-3 | 
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+4 |     # a
+5 |     # aa
+6 |     # aaa
+  |         ^ E501
+7 |     # aaaa
+8 |         # a
   |
 
-E501_2.py:5:81: E501 Line too long (89 > 88 characters)
+E501_2.py:7:6: E501 Line too long (8 > 6 characters)
   |
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                             ^ E501
-6 | 
-7 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+5 |     # aa
+6 |     # aaa
+7 |     # aaaa
+  |         ^^ E501
+8 |         # a
+9 |         # aa
   |
 
-E501_2.py:7:82: E501 Line too long (89 > 88 characters)
-  |
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-6 | 
-7 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |
+E501_2.py:8:5: E501 Line too long (7 > 6 characters)
+   |
+ 6 |     # aaa
+ 7 |     # aaaa
+ 8 |         # a
+   |           ^ E501
+ 9 |         # aa
+10 |         # aaa
+   |
+
+E501_2.py:9:5: E501 Line too long (8 > 6 characters)
+   |
+ 7 |     # aaaa
+ 8 |         # a
+ 9 |         # aa
+   |           ^^ E501
+10 |         # aaa
+   |
+
+E501_2.py:10:5: E501 Line too long (9 > 6 characters)
+   |
+ 8 |         # a
+ 9 |         # aa
+10 |         # aaa
+   |           ^^^ E501
+11 | 
+12 | if True: # noqa: E501
+   |
+
+E501_2.py:14:6: E501 Line too long (7 > 6 characters)
+   |
+12 | if True: # noqa: E501
+13 |     [12]
+14 |     [12 ]
+   |         ^ E501
+15 |     [1,2]
+16 |     [1, 2]
+   |
 
-E501_2.py:10:82: E501 Line too long (89 > 88 characters)
+E501_2.py:16:6: E501 Line too long (8 > 6 characters)
    |
- 8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
- 9 | 
-10 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-   |                                                                                         ^ E501
-11 | d   =   """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+14 |     [12 ]
+15 |     [1,2]
+16 |     [1, 2]
+   |         ^^ E501
    |
 
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_4.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_4.snap
index dc40a961540c3..3fd272e5d0398 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_4.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_4.snap
@@ -1,65 +1,110 @@
 ---
 source: crates/ruff/src/rules/pycodestyle/mod.rs
 ---
-E501_2.py:1:81: E501 Line too long (89 > 88 characters)
+E501_2.py:2:7: E501 Line too long (7 > 6 characters)
   |
-1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+1 | # aaaa
+2 | # aaaaa
+  |       ^ E501
+3 |     # a
+4 |     # a
   |
 
-E501_2.py:2:77: E501 Line too long (93 > 88 characters)
+E501_2.py:3:7: E501 Line too long (7 > 6 characters)
   |
-1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^^^^^ E501
-3 | 
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+1 | # aaaa
+2 | # aaaaa
+3 |     # a
+  |       ^ E501
+4 |     # a
+5 |     # aa
   |
 
-E501_2.py:4:81: E501 Line too long (89 > 88 characters)
+E501_2.py:4:4: E501 Line too long (7 > 6 characters)
   |
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-3 | 
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+2 | # aaaaa
+3 |     # a
+4 |     # a
+  |       ^ E501
+5 |     # aa
+6 |     # aaa
   |
 
-E501_2.py:5:77: E501 Line too long (93 > 88 characters)
+E501_2.py:5:4: E501 Line too long (8 > 6 characters)
   |
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^^^^^ E501
-6 | 
-7 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+3 |     # a
+4 |     # a
+5 |     # aa
+  |       ^^ E501
+6 |     # aaa
+7 |     # aaaa
   |
 
-E501_2.py:7:82: E501 Line too long (89 > 88 characters)
+E501_2.py:6:4: E501 Line too long (9 > 6 characters)
   |
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-6 | 
-7 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+4 |     # a
+5 |     # aa
+6 |     # aaa
+  |       ^^^ E501
+7 |     # aaaa
+8 |         # a
   |
 
-E501_2.py:8:78: E501 Line too long (89 > 88 characters)
+E501_2.py:7:4: E501 Line too long (10 > 6 characters)
+  |
+5 |     # aa
+6 |     # aaa
+7 |     # aaaa
+  |       ^^^^ E501
+8 |         # a
+9 |         # aa
+  |
+
+E501_2.py:8:3: E501 Line too long (11 > 6 characters)
+   |
+ 6 |     # aaa
+ 7 |     # aaaa
+ 8 |         # a
+   |         ^^^ E501
+ 9 |         # aa
+10 |         # aaa
+   |
+
+E501_2.py:9:3: E501 Line too long (12 > 6 characters)
+   |
+ 7 |     # aaaa
+ 8 |         # a
+ 9 |         # aa
+   |         ^^^^ E501
+10 |         # aaa
+   |
+
+E501_2.py:10:3: E501 Line too long (13 > 6 characters)
+   |
+ 8 |         # a
+ 9 |         # aa
+10 |         # aaa
+   |         ^^^^^ E501
+11 | 
+12 | if True: # noqa: E501
+   |
+
+E501_2.py:14:4: E501 Line too long (9 > 6 characters)
    |
- 7 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
- 8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-   |                                                                                         ^ E501
- 9 | 
-10 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+12 | if True: # noqa: E501
+13 |     [12]
+14 |     [12 ]
+   |       ^^^ E501
+15 |     [1,2]
+16 |     [1, 2]
    |
 
-E501_2.py:10:82: E501 Line too long (89 > 88 characters)
+E501_2.py:16:4: E501 Line too long (10 > 6 characters)
    |
- 8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
- 9 | 
-10 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-   |                                                                                         ^ E501
-11 | d   =   """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+14 |     [12 ]
+15 |     [1,2]
+16 |     [1, 2]
+   |       ^^^^ E501
    |
 
 
diff --git a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_8.snap b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_8.snap
index bce5eac6e3539..7b2dd3f8f98ab 100644
--- a/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_8.snap
+++ b/crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__tab_size_8.snap
@@ -1,72 +1,110 @@
 ---
 source: crates/ruff/src/rules/pycodestyle/mod.rs
 ---
-E501_2.py:1:81: E501 Line too long (89 > 88 characters)
+E501_2.py:2:7: E501 Line too long (7 > 6 characters)
   |
-1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+1 | # aaaa
+2 | # aaaaa
+  |       ^ E501
+3 |     # a
+4 |     # a
   |
 
-E501_2.py:2:70: E501 Line too long (101 > 88 characters)
+E501_2.py:3:7: E501 Line too long (7 > 6 characters)
   |
-1 | a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                 ^^^^^^^^^^^^^ E501
-3 | 
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+1 | # aaaa
+2 | # aaaaa
+3 |     # a
+  |       ^ E501
+4 |     # a
+5 |     # aa
   |
 
-E501_2.py:4:81: E501 Line too long (89 > 88 characters)
+E501_2.py:4:2: E501 Line too long (11 > 6 characters)
   |
-2 | a   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-3 | 
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+2 | # aaaaa
+3 |     # a
+4 |     # a
+  |     ^^^ E501
+5 |     # aa
+6 |     # aaa
   |
 
-E501_2.py:5:70: E501 Line too long (101 > 88 characters)
+E501_2.py:5:2: E501 Line too long (12 > 6 characters)
   |
-4 | b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                 ^^^^^^^^^^^^^ E501
-6 | 
-7 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+3 |     # a
+4 |     # a
+5 |     # aa
+  |     ^^^^ E501
+6 |     # aaa
+7 |     # aaaa
   |
 
-E501_2.py:7:82: E501 Line too long (89 > 88 characters)
+E501_2.py:6:2: E501 Line too long (13 > 6 characters)
   |
-5 | b   =   """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-6 | 
-7 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-  |                                                                                         ^ E501
-8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+4 |     # a
+5 |     # aa
+6 |     # aaa
+  |     ^^^^^ E501
+7 |     # aaaa
+8 |         # a
   |
 
-E501_2.py:8:71: E501 Line too long (97 > 88 characters)
+E501_2.py:7:2: E501 Line too long (14 > 6 characters)
+  |
+5 |     # aa
+6 |     # aaa
+7 |     # aaaa
+  |     ^^^^^^ E501
+8 |         # a
+9 |         # aa
+  |
+
+E501_2.py:8:2: E501 Line too long (19 > 6 characters)
+   |
+ 6 |     # aaa
+ 7 |     # aaaa
+ 8 |         # a
+   |     ^^^^^^^ E501
+ 9 |         # aa
+10 |         # aaa
+   |
+
+E501_2.py:9:2: E501 Line too long (20 > 6 characters)
+   |
+ 7 |     # aaaa
+ 8 |         # a
+ 9 |         # aa
+   |     ^^^^^^^^ E501
+10 |         # aaa
+   |
+
+E501_2.py:10:2: E501 Line too long (21 > 6 characters)
    |
- 7 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
- 8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-   |                                                                                  ^^^^^^^^ E501
- 9 | 
-10 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+ 8 |         # a
+ 9 |         # aa
+10 |         # aaa
+   |     ^^^^^^^^^ E501
+11 | 
+12 | if True: # noqa: E501
    |
 
-E501_2.py:10:82: E501 Line too long (89 > 88 characters)
+E501_2.py:14:2: E501 Line too long (13 > 6 characters)
    |
- 8 | c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
- 9 | 
-10 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-   |                                                                                         ^ E501
-11 | d   =   """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+12 | if True: # noqa: E501
+13 |     [12]
+14 |     [12 ]
+   |     ^^^^^ E501
+15 |     [1,2]
+16 |     [1, 2]
    |
 
-E501_2.py:11:70: E501 Line too long (89 > 88 characters)
+E501_2.py:16:2: E501 Line too long (14 > 6 characters)
    |
-10 | d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-11 | d   =   """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
-   |                                                                                 ^ E501
+14 |     [12 ]
+15 |     [1,2]
+16 |     [1, 2]
+   |     ^^^^^^ E501
    |