diff --git a/fuzz/fuzz_seeds/generic_2050_function_span.sql b/fuzz/fuzz_seeds/generic_2050_function_span.sql
new file mode 100644
index 0000000000..fe00f984ce
--- /dev/null
+++ b/fuzz/fuzz_seeds/generic_2050_function_span.sql
@@ -0,0 +1 @@
+SELECT foo();
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index d3ffdc2ab0..eeaa056346 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -8397,6 +8397,9 @@ impl fmt::Display for FunctionArguments {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct FunctionArgumentList {
+    /// The closing parenthesis token.
+    #[cfg_attr(feature = "serde", serde(default = "AttachedToken::empty"))]
+    pub closing_token: AttachedToken,
     /// `[ ALL | DISTINCT ]`
     pub duplicate_treatment: Option<DuplicateTreatment>,
     /// The function arguments.
diff --git a/src/ast/spans.rs b/src/ast/spans.rs
index 74e0844d56..008878bb85 100644
--- a/src/ast/spans.rs
+++ b/src/ast/spans.rs
@@ -1864,6 +1864,7 @@ impl Spanned for FunctionArguments {
 impl Spanned for FunctionArgumentList {
     fn span(&self) -> Span {
         let FunctionArgumentList {
+            closing_token,
             duplicate_treatment: _, // enum
             args,
             clauses,
@@ -1873,7 +1874,8 @@ impl Spanned for FunctionArgumentList {
             // # todo: duplicate-treatment span
             args.iter()
                 .map(|i| i.span())
-                .chain(clauses.iter().map(|i| i.span())),
+                .chain(clauses.iter().map(|i| i.span()))
+                .chain(iter::once(closing_token.0.span)),
         )
     }
 }
diff --git a/src/ast/visitor.rs b/src/ast/visitor.rs
index c78ff2bfb9..56fb458b67 100644
--- a/src/ast/visitor.rs
+++ b/src/ast/visitor.rs
@@ -687,6 +687,7 @@ where
 ///           name: ObjectName::from(vec![Ident::new("f")]),
 ///           uses_odbc_syntax: false,
 ///           args: FunctionArguments::List(FunctionArgumentList {
+///               closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
 ///               duplicate_treatment: None,
 ///               args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(old_expr))],
 ///               clauses: vec![],
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index d09c601eb9..4bb6ecac9d 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -2578,8 +2578,9 @@ impl<'a> Parser<'a> {
             arg: FunctionArgExpr::Expr(self.parse_expr()?),
             operator: FunctionArgOperator::Space,
         };
-        self.expect_token(&Token::RParen)?;
+        let closing_token = self.expect_token(&Token::RParen)?.into();
         Ok(FunctionArgumentList {
+            closing_token,
             duplicate_treatment: None,
             args: vec![arg],
             clauses: vec![],
@@ -19691,8 +19692,10 @@ impl<'a> Parser<'a> {
             ));
         }
 
-        if self.consume_token(&Token::RParen) {
+        if self.peek_token_ref().token == Token::RParen {
+            let closing_token = self.next_token().into();
             return Ok(FunctionArgumentList {
+                closing_token,
                 duplicate_treatment: None,
                 args: vec![],
                 clauses,
@@ -19765,8 +19768,9 @@ impl<'a> Parser<'a> {
             ));
         }
 
-        self.expect_token(&Token::RParen)?;
+        let closing_token = self.expect_token(&Token::RParen)?.into();
         Ok(FunctionArgumentList {
+            closing_token,
             duplicate_treatment,
             args,
             clauses,
diff --git a/src/test_utils.rs b/src/test_utils.rs
index 4c9bbb2bc2..963f385f12 100644
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -442,6 +442,7 @@ pub fn call(function: &str, args: impl IntoIterator<Item = Expr>) -> Expr {
         uses_odbc_syntax: false,
         parameters: FunctionArguments::None,
         args: FunctionArguments::List(FunctionArgumentList {
+            closing_token: crate::ast::helpers::attached_token::AttachedToken::empty(),
             duplicate_treatment: None,
             args: args
                 .into_iter()
diff --git a/tests/sqlparser_bigquery.rs b/tests/sqlparser_bigquery.rs
index b110423370..27f402a2bd 100644
--- a/tests/sqlparser_bigquery.rs
+++ b/tests/sqlparser_bigquery.rs
@@ -2281,6 +2281,8 @@ fn parse_map_access_expr() {
                     )]),
                     parameters: FunctionArguments::None,
                     args: FunctionArguments::List(FunctionArgumentList {
+                        closing_token:
+                            sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                         duplicate_treatment: None,
                         args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Value(
                             number("2").with_empty_span(),
diff --git a/tests/sqlparser_clickhouse.rs b/tests/sqlparser_clickhouse.rs
index 3e6fe93270..d4bb88de0b 100644
--- a/tests/sqlparser_clickhouse.rs
+++ b/tests/sqlparser_clickhouse.rs
@@ -792,6 +792,8 @@ fn parse_create_table_with_primary_key() {
                 assert_eq!(
                     actual.args,
                     FunctionArguments::List(FunctionArgumentList {
+                        closing_token:
+                            sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                         args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(Identifier(
                             Ident::new(arg)
                         )),)],
@@ -849,6 +851,7 @@ fn parse_create_table_with_variant_default_expressions() {
                                 name: ObjectName::from(vec![Ident::new("now")]),
                                 uses_odbc_syntax: false,
                                 args: FunctionArguments::List(FunctionArgumentList {
+                                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                                     args: vec![],
                                     duplicate_treatment: None,
                                     clauses: vec![],
@@ -870,6 +873,7 @@ fn parse_create_table_with_variant_default_expressions() {
                                 name: ObjectName::from(vec![Ident::new("now")]),
                                 uses_odbc_syntax: false,
                                 args: FunctionArguments::List(FunctionArgumentList {
+                                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                                     args: vec![],
                                     duplicate_treatment: None,
                                     clauses: vec![],
@@ -899,6 +903,7 @@ fn parse_create_table_with_variant_default_expressions() {
                                 name: ObjectName::from(vec![Ident::new("toString")]),
                                 uses_odbc_syntax: false,
                                 args: FunctionArguments::List(FunctionArgumentList {
+                                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                                     args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
                                         Identifier(Ident::new("c"))
                                     ))],
diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
index 7649790742..dc0bacc141 100644
--- a/tests/sqlparser_common.rs
+++ b/tests/sqlparser_common.rs
@@ -1438,6 +1438,7 @@ fn parse_select_count_wildcard() {
             uses_odbc_syntax: false,
             parameters: FunctionArguments::None,
             args: FunctionArguments::List(FunctionArgumentList {
+                closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                 duplicate_treatment: None,
                 args: vec![FunctionArg::Unnamed(FunctionArgExpr::Wildcard)],
                 clauses: vec![],
@@ -1461,6 +1462,7 @@ fn parse_select_count_distinct() {
             uses_odbc_syntax: false,
             parameters: FunctionArguments::None,
             args: FunctionArguments::List(FunctionArgumentList {
+                closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                 duplicate_treatment: Some(DuplicateTreatment::Distinct),
                 args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::UnaryOp {
                     op: UnaryOperator::Plus,
@@ -3569,6 +3571,7 @@ fn parse_select_having() {
                 uses_odbc_syntax: false,
                 parameters: FunctionArguments::None,
                 args: FunctionArguments::List(FunctionArgumentList {
+                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                     duplicate_treatment: None,
                     args: vec![FunctionArg::Unnamed(FunctionArgExpr::Wildcard)],
                     clauses: vec![],
@@ -3600,6 +3603,7 @@ fn parse_select_qualify() {
                 uses_odbc_syntax: false,
                 parameters: FunctionArguments::None,
                 args: FunctionArguments::List(FunctionArgumentList {
+                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                     duplicate_treatment: None,
                     args: vec![],
                     clauses: vec![],
@@ -4021,6 +4025,7 @@ fn parse_listagg() {
             uses_odbc_syntax: false,
             parameters: FunctionArguments::None,
             args: FunctionArguments::List(FunctionArgumentList {
+                closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                 duplicate_treatment: Some(DuplicateTreatment::Distinct),
                 args: vec![
                     FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Identifier(Ident::new(
@@ -6378,6 +6383,7 @@ fn parse_named_argument_function() {
             uses_odbc_syntax: false,
             parameters: FunctionArguments::None,
             args: FunctionArguments::List(FunctionArgumentList {
+                closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                 duplicate_treatment: None,
                 args: vec![
                     FunctionArg::Named {
@@ -6418,6 +6424,7 @@ fn parse_named_argument_function_with_eq_operator() {
             uses_odbc_syntax: false,
             parameters: FunctionArguments::None,
             args: FunctionArguments::List(FunctionArgumentList {
+                closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                 duplicate_treatment: None,
                 args: vec![
                     FunctionArg::Named {
@@ -6493,6 +6500,7 @@ fn parse_window_functions() {
             uses_odbc_syntax: false,
             parameters: FunctionArguments::None,
             args: FunctionArguments::List(FunctionArgumentList {
+                closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                 duplicate_treatment: None,
                 args: vec![],
                 clauses: vec![],
@@ -6635,6 +6643,8 @@ fn test_parse_named_window() {
                     uses_odbc_syntax: false,
                     parameters: FunctionArguments::None,
                     args: FunctionArguments::List(FunctionArgumentList {
+                        closing_token:
+                            sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                         duplicate_treatment: None,
                         args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
                             Expr::Identifier(Ident {
@@ -6670,6 +6680,8 @@ fn test_parse_named_window() {
                     uses_odbc_syntax: false,
                     parameters: FunctionArguments::None,
                     args: FunctionArguments::List(FunctionArgumentList {
+                        closing_token:
+                            sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                         duplicate_treatment: None,
                         args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
                             Expr::Identifier(Ident {
@@ -11640,6 +11652,7 @@ fn parse_time_functions() {
             uses_odbc_syntax: false,
             parameters: FunctionArguments::None,
             args: FunctionArguments::List(FunctionArgumentList {
+                closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                 duplicate_treatment: None,
                 args: vec![],
                 clauses: vec![],
@@ -13407,6 +13420,7 @@ fn parse_call() {
             uses_odbc_syntax: false,
             parameters: FunctionArguments::None,
             args: FunctionArguments::List(FunctionArgumentList {
+                closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                 duplicate_treatment: None,
                 args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Value(
                     (Value::SingleQuotedString("a".to_string())).with_empty_span()
@@ -13926,6 +13940,8 @@ fn parse_map_access_expr() {
                     )]),
                     parameters: FunctionArguments::None,
                     args: FunctionArguments::List(FunctionArgumentList {
+                        closing_token:
+                            sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                         duplicate_treatment: None,
                         args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Value(
                             (number("2")).with_empty_span(),
@@ -14266,6 +14282,7 @@ fn test_selective_aggregation() {
                 uses_odbc_syntax: false,
                 parameters: FunctionArguments::None,
                 args: FunctionArguments::List(FunctionArgumentList {
+                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                     duplicate_treatment: None,
                     args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
                         Expr::Identifier(Ident::new("name"))
@@ -14285,6 +14302,8 @@ fn test_selective_aggregation() {
                     uses_odbc_syntax: false,
                     parameters: FunctionArguments::None,
                     args: FunctionArguments::List(FunctionArgumentList {
+                        closing_token:
+                            sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                         duplicate_treatment: None,
                         args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
                             Expr::Identifier(Ident::new("name"))
@@ -17078,6 +17097,7 @@ fn parse_composite_access_expr() {
                 uses_odbc_syntax: false,
                 parameters: FunctionArguments::None,
                 args: FunctionArguments::List(FunctionArgumentList {
+                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                     duplicate_treatment: None,
                     args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
                         Expr::Identifier(Ident::new("a"))
@@ -17102,6 +17122,7 @@ fn parse_composite_access_expr() {
                 uses_odbc_syntax: false,
                 parameters: FunctionArguments::None,
                 args: FunctionArguments::List(FunctionArgumentList {
+                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                     duplicate_treatment: None,
                     args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
                         Expr::Identifier(Ident::new("a"))
@@ -17128,6 +17149,7 @@ fn parse_composite_access_expr() {
             uses_odbc_syntax: false,
             parameters: FunctionArguments::None,
             args: FunctionArguments::List(FunctionArgumentList {
+                closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                 duplicate_treatment: None,
                 args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
                     Expr::Identifier(Ident::new("a")),
@@ -22100,6 +22122,31 @@ fn parse_qualified_literal_prefix_requires_adjacent_period() {
     }
 }
 
+#[test]
+fn function_spans_include_closing_parentheses() {
+    for call in ["foo()", "foo(1)", "foo(bar())", "foo( /* comment */ )"] {
+        let sql = format!("SELECT {call}");
+        let statements = all_dialects()
+            .run_parser_method(&sql, |parser| parser.parse_statements())
+            .unwrap();
+        let Statement::Query(query) = &statements[0] else {
+            panic!("expected a query");
+        };
+        let SetExpr::Select(select) = query.body.as_ref() else {
+            panic!("expected a select");
+        };
+        let UnnamedExpr(Expr::Function(function)) = &select.projection[0] else {
+            panic!("expected a function");
+        };
+        assert_eq!(function.span().start, Location::new(1, 8), "{call}");
+        assert_eq!(
+            function.span().end,
+            Location::new(1, sql.len() as u64 + 1),
+            "{call}"
+        );
+    }
+}
+
 #[test]
 fn parse_cache_table_options_without_flag() {
     let dialects = all_dialects();
@@ -22322,6 +22369,7 @@ fn parse_delimited_identifiers() {
             uses_odbc_syntax: false,
             parameters: FunctionArguments::None,
             args: FunctionArguments::List(FunctionArgumentList {
+                closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                 duplicate_treatment: None,
                 args: vec![],
                 clauses: vec![],
diff --git a/tests/sqlparser_duckdb.rs b/tests/sqlparser_duckdb.rs
index 216d514713..184f067f58 100644
--- a/tests/sqlparser_duckdb.rs
+++ b/tests/sqlparser_duckdb.rs
@@ -638,6 +638,7 @@ fn test_duckdb_named_argument_function_with_assignment_operator() {
             uses_odbc_syntax: false,
             parameters: FunctionArguments::None,
             args: FunctionArguments::List(FunctionArgumentList {
+                closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                 duplicate_treatment: None,
                 args: vec![
                     FunctionArg::Named {
diff --git a/tests/sqlparser_mssql.rs b/tests/sqlparser_mssql.rs
index fe8531cace..e79ffd25ce 100644
--- a/tests/sqlparser_mssql.rs
+++ b/tests/sqlparser_mssql.rs
@@ -1834,6 +1834,7 @@ fn parse_create_table_with_valid_options() {
                             parameters: FunctionArguments::None,
                             args: FunctionArguments::List(
                                 FunctionArgumentList {
+                                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                                     duplicate_treatment: None,
                                     args: vec![
                                         FunctionArg::Unnamed(
diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs
index 11a4703f55..a814812e18 100644
--- a/tests/sqlparser_postgres.rs
+++ b/tests/sqlparser_postgres.rs
@@ -3401,6 +3401,8 @@ fn parse_create_indices_with_operator_classes() {
                         uses_odbc_syntax: false,
                         parameters: FunctionArguments::None,
                         args: FunctionArguments::List(FunctionArgumentList {
+                            closing_token:
+                                sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                             duplicate_treatment: None,
                             args: vec![
                                 FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Identifier(
@@ -4360,6 +4362,7 @@ fn test_composite_value() {
                 uses_odbc_syntax: false,
                 parameters: FunctionArguments::None,
                 args: FunctionArguments::List(FunctionArgumentList {
+                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                     duplicate_treatment: None,
                     args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Array(
                         Array {
@@ -6237,6 +6240,8 @@ fn parse_create_table_with_partition_by() {
                     assert_eq!("RANGE", f.name.to_string());
                     assert_eq!(
                         FunctionArguments::List(FunctionArgumentList {
+                            closing_token:
+                                sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                             duplicate_treatment: None,
                             clauses: vec![],
                             args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
diff --git a/tests/sqlparser_snowflake.rs b/tests/sqlparser_snowflake.rs
index 5e3cbc8e01..1f433d079c 100644
--- a/tests/sqlparser_snowflake.rs
+++ b/tests/sqlparser_snowflake.rs
@@ -541,6 +541,8 @@ fn test_snowflake_create_table_cluster_by() {
                         uses_odbc_syntax: false,
                         parameters: FunctionArguments::None,
                         args: FunctionArguments::List(FunctionArgumentList {
+                            closing_token:
+                                sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                             args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
                                 Expr::Identifier(Ident::new("c"))
                             ))],
@@ -1605,6 +1607,8 @@ fn test_alter_table_clustering() {
                         uses_odbc_syntax: false,
                         parameters: FunctionArguments::None,
                         args: FunctionArguments::List(FunctionArgumentList {
+                            closing_token:
+                                sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                             args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
                                 Expr::Identifier(Ident::new("c3"))
                             ))],
@@ -4664,6 +4668,7 @@ fn test_snowflake_identifier_function() {
             assert_eq!(
                 *args,
                 FunctionArguments::List(FunctionArgumentList {
+                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                     args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Value(
                         Value::SingleQuotedString("email".to_string()).into()
                     )))],
@@ -4685,6 +4690,7 @@ fn test_snowflake_identifier_function() {
             assert_eq!(
                 *args,
                 FunctionArguments::List(FunctionArgumentList {
+                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                     args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Value(
                         Value::SingleQuotedString("\"Email\"".to_string()).into()
                     )))],
@@ -4709,6 +4715,7 @@ fn test_snowflake_identifier_function() {
             assert_eq!(
                 *args,
                 FunctionArguments::List(FunctionArgumentList {
+                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                     args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Value(
                         Value::SingleQuotedString("alias1".to_string()).into()
                     )))],
diff --git a/tests/sqlparser_sqlite.rs b/tests/sqlparser_sqlite.rs
index 10059c89e0..6767834526 100644
--- a/tests/sqlparser_sqlite.rs
+++ b/tests/sqlparser_sqlite.rs
@@ -443,6 +443,7 @@ fn parse_window_function_with_filter() {
                 uses_odbc_syntax: false,
                 parameters: FunctionArguments::None,
                 args: FunctionArguments::List(FunctionArgumentList {
+                    closing_token: sqlparser::ast::helpers::attached_token::AttachedToken::empty(),
                     duplicate_treatment: None,
                     args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(
                         Expr::Identifier(Ident::new("x"))