progress

Author: psteinroe

crates/pgls_pretty_print/src/nodes/a_expr.rs

@@ -250,7 +250,7 @@ fn emit_aexpr_nullif(e: &mut EventEmitter, n: &AExpr) {
 fn emit_aexpr_in(e: &mut EventEmitter, n: &AExpr) {
     if let Some(ref lexpr) = n.lexpr {
         super::emit_node(lexpr, e);
-        e.space();
+        e.line(LineType::SoftOrSpace);
     }
 
     let is_not = extract_simple_operator(&n.name)
@@ -272,7 +272,11 @@ fn emit_aexpr_in(e: &mut EventEmitter, n: &AExpr) {
             Some(NodeEnum::SubLink(_)) => super::emit_node(rexpr, e),
             _ => {
                 e.token(TokenKind::L_PAREN);
+                e.indent_start();
+                e.line(LineType::Soft);
                 super::emit_node(rexpr, e);
+                e.indent_end();
+                e.line(LineType::Soft);
                 e.token(TokenKind::R_PAREN);
             }
         }
@@ -378,7 +382,7 @@ fn emit_aexpr_similar(e: &mut EventEmitter, n: &AExpr) {
 fn emit_aexpr_between(e: &mut EventEmitter, n: &AExpr) {
     if let Some(ref lexpr) = n.lexpr {
         super::emit_node(lexpr, e);
-        e.space();
+        e.line(LineType::SoftOrSpace);
     }
 
     e.token(TokenKind::BETWEEN_KW);
@@ -391,7 +395,7 @@ fn emit_aexpr_between(e: &mut EventEmitter, n: &AExpr) {
                 super::emit_node(&list.items[0], e);
             }
             if list.items.len() >= 2 {
-                e.space();
+                e.line(LineType::SoftOrSpace);
                 e.token(TokenKind::AND_KW);
                 e.space();
                 super::emit_node(&list.items[1], e);
@@ -406,7 +410,7 @@ fn emit_aexpr_between(e: &mut EventEmitter, n: &AExpr) {
 fn emit_aexpr_not_between(e: &mut EventEmitter, n: &AExpr) {
     if let Some(ref lexpr) = n.lexpr {
         super::emit_node(lexpr, e);
-        e.space();
+        e.line(LineType::SoftOrSpace);
     }
 
     e.token(TokenKind::NOT_KW);
@@ -421,7 +425,7 @@ fn emit_aexpr_not_between(e: &mut EventEmitter, n: &AExpr) {
                 super::emit_node(&list.items[0], e);
             }
             if list.items.len() >= 2 {
-                e.space();
+                e.line(LineType::SoftOrSpace);
                 e.token(TokenKind::AND_KW);
                 e.space();
                 super::emit_node(&list.items[1], e);
@@ -436,7 +440,7 @@ fn emit_aexpr_not_between(e: &mut EventEmitter, n: &AExpr) {
 fn emit_aexpr_between_sym(e: &mut EventEmitter, n: &AExpr) {
     if let Some(ref lexpr) = n.lexpr {
         super::emit_node(lexpr, e);
-        e.space();
+        e.line(LineType::SoftOrSpace);
     }
 
     e.token(TokenKind::BETWEEN_KW);
@@ -451,7 +455,7 @@ fn emit_aexpr_between_sym(e: &mut EventEmitter, n: &AExpr) {
                 super::emit_node(&list.items[0], e);
             }
             if list.items.len() >= 2 {
-                e.space();
+                e.line(LineType::SoftOrSpace);
                 e.token(TokenKind::AND_KW);
                 e.space();
                 super::emit_node(&list.items[1], e);
@@ -466,7 +470,7 @@ fn emit_aexpr_between_sym(e: &mut EventEmitter, n: &AExpr) {
 fn emit_aexpr_not_between_sym(e: &mut EventEmitter, n: &AExpr) {
     if let Some(ref lexpr) = n.lexpr {
         super::emit_node(lexpr, e);
-        e.space();
+        e.line(LineType::SoftOrSpace);
     }
 
     e.token(TokenKind::NOT_KW);
@@ -483,7 +487,7 @@ fn emit_aexpr_not_between_sym(e: &mut EventEmitter, n: &AExpr) {
                 super::emit_node(&list.items[0], e);
             }
             if list.items.len() >= 2 {
-                e.space();
+                e.line(LineType::SoftOrSpace);
                 e.token(TokenKind::AND_KW);
                 e.space();
                 super::emit_node(&list.items[1], e);
@@ -544,9 +548,20 @@ fn operator_needs_space(op: &str) -> bool {
 
 fn operator_prefers_line_break(name: &[Node]) -> bool {
     match extract_simple_operator(name) {
+        // Comparison operators
         Some("=") | Some("<>") | Some("!=") | Some("<") | Some(">") | Some("<=") | Some(">=")
-        | Some("||") | Some("AND") | Some("and") | Some("OR") | Some("or") => true,
-        _ => false,
+        // Logical operators
+        | Some("||") | Some("AND") | Some("and") | Some("OR") | Some("or")
+        // Arithmetic operators - allow breaking around these for narrow widths
+        | Some("+") | Some("-") | Some("*") | Some("/") | Some("%") | Some("^")
+        // Bitwise operators
+        | Some("&") | Some("|") | Some("#") | Some("~") | Some("<<") | Some(">>")
+        // Other common operators
+        | Some("@") | Some("@@") | Some("->") | Some("->>") | Some("#>") | Some("#>>")
+        | Some("?") | Some("?|") | Some("?&") | Some("@>") | Some("<@") | Some("&&") => true,
+        // For any other operator, still allow line breaks - they're likely user-defined
+        // and we want consistent formatting behavior
+        _ => true,
     }
 }
 

crates/pgls_pretty_print/src/nodes/access_priv.rs

@@ -1,5 +1,5 @@
 use crate::TokenKind;
-use crate::emitter::{EventEmitter, GroupKind};
+use crate::emitter::{EventEmitter, GroupKind, LineType};
 use pgls_query::protobuf::AccessPriv;
 
 use super::node_list::emit_comma_separated_list;
@@ -18,7 +18,7 @@ pub(super) fn emit_access_priv(e: &mut EventEmitter, n: &AccessPriv) {
 
     // Optional column list for column-level privileges
     if !n.cols.is_empty() {
-        e.space();
+        e.line(LineType::SoftOrSpace);
         e.token(TokenKind::L_PAREN);
         emit_comma_separated_list(e, &n.cols, super::emit_node);
         e.token(TokenKind::R_PAREN);

crates/pgls_pretty_print/src/nodes/aggref.rs

@@ -39,7 +39,7 @@ pub(super) fn emit_aggref(e: &mut EventEmitter, n: &Aggref) {
     e.token(TokenKind::R_PAREN);
 
     if !n.aggorder.is_empty() {
-        e.space();
+        e.line(LineType::SoftOrSpace);
         e.token(TokenKind::ORDER_KW);
         e.space();
         e.token(TokenKind::BY_KW);
@@ -48,7 +48,7 @@ pub(super) fn emit_aggref(e: &mut EventEmitter, n: &Aggref) {
     }
 
     if let Some(ref filter) = n.aggfilter {
-        e.space();
+        e.line(LineType::SoftOrSpace);
         e.token(TokenKind::FILTER_KW);
         e.space();
         e.token(TokenKind::L_PAREN);

crates/pgls_pretty_print/src/nodes/alias.rs

@@ -1,7 +1,7 @@
 use pgls_query::protobuf::Alias;
 
 use crate::TokenKind;
-use crate::emitter::{EventEmitter, GroupKind};
+use crate::emitter::{EventEmitter, GroupKind, LineType};
 
 use super::node_list::emit_comma_separated_list;
 
@@ -19,7 +19,7 @@ pub(super) fn emit_alias(e: &mut EventEmitter, n: &Alias) {
 
     // Add column aliases if present
     if !n.colnames.is_empty() {
-        e.space();
+        e.line(LineType::SoftOrSpace);
         e.token(TokenKind::L_PAREN);
         emit_comma_separated_list(e, &n.colnames, |node, e| {
             // Column names in alias are String nodes

crates/pgls_pretty_print/src/nodes/alter_collation_stmt.rs

@@ -1,5 +1,5 @@
 use crate::TokenKind;
-use crate::emitter::{EventEmitter, GroupKind};
+use crate::emitter::{EventEmitter, GroupKind, LineType};
 use pgls_query::protobuf::AlterCollationStmt;
 
 use super::node_list::emit_dot_separated_list;
@@ -16,7 +16,7 @@ pub(super) fn emit_alter_collation_stmt(e: &mut EventEmitter, n: &AlterCollation
         emit_dot_separated_list(e, &n.collname);
     }
 
-    e.space();
+    e.line(LineType::SoftOrSpace);
     e.token(TokenKind::IDENT("REFRESH".to_string()));
     e.space();
     e.token(TokenKind::IDENT("VERSION".to_string()));

crates/pgls_pretty_print/src/nodes/alter_database_refresh_coll_stmt.rs

@@ -1,5 +1,5 @@
 use crate::TokenKind;
-use crate::emitter::{EventEmitter, GroupKind};
+use crate::emitter::{EventEmitter, GroupKind, LineType};
 use pgls_query::protobuf::AlterDatabaseRefreshCollStmt;
 
 pub(super) fn emit_alter_database_refresh_coll_stmt(
@@ -17,7 +17,7 @@ pub(super) fn emit_alter_database_refresh_coll_stmt(
         e.token(TokenKind::IDENT(n.dbname.clone()));
     }
 
-    e.space();
+    e.line(LineType::SoftOrSpace);
     e.token(TokenKind::IDENT("REFRESH".to_string()));
     e.space();
     e.token(TokenKind::IDENT("COLLATION".to_string()));

crates/pgls_pretty_print/src/nodes/alter_database_set_stmt.rs

@@ -1,5 +1,5 @@
 use crate::TokenKind;
-use crate::emitter::{EventEmitter, GroupKind};
+use crate::emitter::{EventEmitter, GroupKind, LineType};
 use pgls_query::protobuf::AlterDatabaseSetStmt;
 
 pub(super) fn emit_alter_database_set_stmt(e: &mut EventEmitter, n: &AlterDatabaseSetStmt) {
@@ -15,7 +15,7 @@ pub(super) fn emit_alter_database_set_stmt(e: &mut EventEmitter, n: &AlterDataba
     }
 
     if let Some(ref setstmt) = n.setstmt {
-        e.space();
+        e.line(LineType::SoftOrSpace);
         super::emit_variable_set_stmt(e, setstmt);
     }
 

crates/pgls_pretty_print/src/nodes/alter_database_stmt.rs

@@ -1,5 +1,5 @@
 use crate::TokenKind;
-use crate::emitter::{EventEmitter, GroupKind};
+use crate::emitter::{EventEmitter, GroupKind, LineType};
 use pgls_query::protobuf::AlterDatabaseStmt;
 
 use super::node_list::emit_comma_separated_list;
@@ -17,7 +17,7 @@ pub(super) fn emit_alter_database_stmt(e: &mut EventEmitter, n: &AlterDatabaseSt
     }
 
     if !n.options.is_empty() {
-        e.space();
+        e.line(LineType::SoftOrSpace);
         emit_comma_separated_list(e, &n.options, super::emit_node);
     }
 

crates/pgls_pretty_print/src/nodes/alter_enum_stmt.rs

@@ -1,5 +1,5 @@
 use crate::TokenKind;
-use crate::emitter::{EventEmitter, GroupKind};
+use crate::emitter::{EventEmitter, GroupKind, LineType};
 use pgls_query::protobuf::AlterEnumStmt;
 
 use super::node_list::emit_dot_separated_list;
@@ -18,7 +18,7 @@ pub(super) fn emit_alter_enum_stmt(e: &mut EventEmitter, n: &AlterEnumStmt) {
         emit_dot_separated_list(e, &n.type_name);
     }
 
-    e.space();
+    e.line(LineType::SoftOrSpace);
 
     // Check if this is ADD VALUE or RENAME VALUE
     if !n.old_val.is_empty() {
@@ -54,7 +54,7 @@ pub(super) fn emit_alter_enum_stmt(e: &mut EventEmitter, n: &AlterEnumStmt) {
 
         // Optional BEFORE/AFTER clause
         if !n.new_val_neighbor.is_empty() {
-            e.space();
+            e.line(LineType::SoftOrSpace);
             if n.new_val_is_after {
                 emit_keyword(e, "AFTER");
             } else {

crates/pgls_pretty_print/src/nodes/alter_extension_contents_stmt.rs

@@ -1,5 +1,5 @@
 use crate::TokenKind;
-use crate::emitter::{EventEmitter, GroupKind};
+use crate::emitter::{EventEmitter, GroupKind, LineType};
 use pgls_query::protobuf::{AlterExtensionContentsStmt, ObjectType};
 
 pub(super) fn emit_alter_extension_contents_stmt(
@@ -17,7 +17,7 @@ pub(super) fn emit_alter_extension_contents_stmt(
         e.token(TokenKind::IDENT(n.extname.clone()));
     }
 
-    e.space();
+    e.line(LineType::SoftOrSpace);
 
     // action: 1=ADD, -1=DROP
     if n.action == 1 {