SQL 포매팅 및 IntelliSense 전체 스윕 보강

Author: letspurify-ux

src/sql_parser_engine/state.rs

@@ -1439,24 +1439,30 @@ impl SplitState {
 
 
     pub(crate) fn track_create_plsql_symbol(&mut self, ch: char) {
-        if self.block_depth() != 0
-            || self.create_plsql_kind != CreatePlsqlKind::PackageBody
-            || !self.awaiting_package_body_name
-        {
-            return;
+        if self.pending_sql_macro_call_spec && ch == '(' {
+            // `SQL_MACRO(TABLE)` / `SQL_MACRO(SCALAR)` is a function
+            // declaration property. It is followed by the real `AS`/`IS`
+            // routine body and must not be treated like the body-less
+            // `AS SQL_MACRO;` call-spec form.
+            self.pending_sql_macro_call_spec = false;
         }
 
-        let keeps_awaiting_segment_after_dot = self.awaiting_package_body_name_dot
-            && matches!(ch, '/' | '*' | '-');
+        if self.block_depth() == 0
+            && self.create_plsql_kind == CreatePlsqlKind::PackageBody
+            && self.awaiting_package_body_name
+        {
+            let keeps_awaiting_segment_after_dot = self.awaiting_package_body_name_dot
+                && matches!(ch, '/' | '*' | '-');
 
-        match ch {
-            '.' if !self.package_body_name_segments.is_empty() => {
-                self.awaiting_package_body_name_dot = true;
-            }
-            _ if !ch.is_whitespace() && !keeps_awaiting_segment_after_dot => {
-                self.awaiting_package_body_name_dot = false;
+            match ch {
+                '.' if !self.package_body_name_segments.is_empty() => {
+                    self.awaiting_package_body_name_dot = true;
+                }
+                _ if !ch.is_whitespace() && !keeps_awaiting_segment_after_dot => {
+                    self.awaiting_package_body_name_dot = false;
+                }
+                _ => {}
             }
-            _ => {}
         }
     }
 

src/sql_parser_engine/tests.rs

@@ -5179,6 +5179,25 @@ fn sql_macro_call_spec_without_external_keyword_splits_before_following_statemen
     assert!(statements[1].starts_with("SELECT 12 FROM dual"));
 }
 
+#[test]
+fn parenthesized_sql_macro_property_keeps_function_body_attached() {
+    let mut engine = SqlParserEngine::new();
+
+    engine.process_line("CREATE OR REPLACE FUNCTION topn RETURN VARCHAR2 SQL_MACRO(TABLE)");
+    engine.process_line("IS");
+    engine.process_line("BEGIN");
+    engine.process_line("  RETURN 'SELECT 1 FROM dual';");
+    engine.process_line("END topn;");
+    engine.process_line("/");
+    engine.process_line("SELECT * FROM topn();");
+
+    let statements = engine.finalize_and_take_statements();
+    assert_eq!(statements.len(), 2, "unexpected statements: {statements:?}");
+    assert!(statements[0].contains("SQL_MACRO(TABLE)\nIS\nBEGIN"));
+    assert!(statements[0].contains("END topn"));
+    assert!(statements[1].starts_with("SELECT * FROM topn()"));
+}
+
 #[test]
 fn package_nested_sql_macro_call_spec_closes_nested_function_block_on_semicolon() {
     let mut engine = SqlParserEngine::new();

src/sql_text.rs

@@ -5276,6 +5276,22 @@ fn line_starts_ddl_query_body_header_prefix(line: &str) -> bool {
         return true;
     }
 
+    if words
+        .get(idx)
+        .is_some_and(|word| word.eq_ignore_ascii_case("JSON"))
+        && words
+            .get(idx + 1)
+            .is_some_and(|word| word.eq_ignore_ascii_case("RELATIONAL"))
+        && words
+            .get(idx + 2)
+            .is_some_and(|word| word.eq_ignore_ascii_case("DUALITY"))
+        && words
+            .get(idx + 3)
+            .is_some_and(|word| word.eq_ignore_ascii_case("VIEW"))
+    {
+        return true;
+    }
+
     if words
         .get(idx)
         .is_some_and(|word| word.eq_ignore_ascii_case("TABLE"))
@@ -11445,6 +11461,9 @@ mod tests {
         assert!(line_is_ddl_query_body_header(
             "CREATE MATERIALIZED VIEW mv_demo AS"
         ));
+        assert!(line_is_ddl_query_body_header(
+            "CREATE OR REPLACE JSON RELATIONAL DUALITY VIEW dv_demo AS"
+        ));
         assert!(line_is_ddl_query_body_header("CREATE TABLE t_demo AS"));
         assert!(line_is_ddl_query_body_header(
             "CREATE TEMPORARY TABLE t_demo AS"

src/ui/intellisense.rs

@@ -3723,7 +3723,13 @@ fn incomplete_quoted_identifier_start_before_cursor(
                 span.kind == crate::sql_parser_engine::LexicalKind::QuotedIdentifier
                     && span.start == prev_idx
             });
-            let bracket_starts_in_code = ch == '[' && lexical_span.is_none();
+            let bracket_starts_graph_edge = ch == '['
+                && text
+                    .get(..prev_idx)
+                    .and_then(|head| head.chars().next_back())
+                    == Some('-');
+            let bracket_starts_in_code =
+                ch == '[' && lexical_span.is_none() && !bracket_starts_graph_edge;
             if (is_parser_quoted_identifier_start || bracket_starts_in_code)
                 && !has_unescaped_identifier_delimiter(
                     text,
@@ -6374,6 +6380,17 @@ mod intellisense_tests {
         assert_eq!(end, cursor);
     }
 
+    #[test]
+    fn get_word_at_cursor_does_not_treat_property_graph_edge_as_bracket_identifier() {
+        let sql = "SELECT * FROM GRAPH_TABLE (g MATCH (a IS node) -[e I links]-> (b IS node))";
+        let cursor = sql.find(" links").expect("expected cursor anchor");
+        let (word, start, end) = get_word_at_cursor(sql, cursor);
+
+        assert_eq!(word, "I");
+        assert_eq!(sql.get(start..cursor), Some("I"));
+        assert_eq!(end, cursor);
+    }
+
     #[test]
     fn get_word_at_cursor_ignores_completed_quoted_identifier_before_cursor() {
         let sql = r#"SELECT rec."Street Name".ci FROM dual"#;

src/ui/intellisense_context.rs

@@ -1198,6 +1198,22 @@ fn is_from_consuming_function(name: &str) -> bool {
     sql_text::is_from_consuming_function(name)
 }
 
+fn is_nth_value_from_modifier(tokens: &[SqlToken], from_idx: usize) -> bool {
+    if !next_word_upper(tokens, from_idx.saturating_add(1))
+        .is_some_and(|(word, _)| matches!(word.as_str(), "FIRST" | "LAST"))
+    {
+        return false;
+    }
+    let Some((SqlToken::Symbol(close), close_idx)) = prev_non_comment_token(tokens, from_idx)
+    else {
+        return false;
+    };
+    close == ")"
+        && matching_open_paren_before_close(tokens, close_idx)
+            .and_then(|open_idx| prev_word_upper(tokens, open_idx))
+            .is_some_and(|(word, _)| word == "NTH_VALUE")
+}
+
 /// FROM-clause table functions that may reference left-side row source aliases
 /// without an explicit APPLY/LATERAL modifier.
 fn is_implicitly_lateral_table_function(name: &str) -> bool {
@@ -3860,6 +3876,8 @@ fn scan_cursor_context(tokens: &[SqlToken], cursor_token_len: usize) -> CursorSc
                         let from_belongs_to_distinct_predicate =
                             is_distinct_from_operator(tokens, idx)
                                 && current_phase.is_column_context();
+                        let from_belongs_to_nth_value_modifier =
+                            is_nth_value_from_modifier(tokens, idx);
                         let should_treat_as_function_from = depth_frames
                             .get(depth)
                             .map(|frame| {
@@ -3880,6 +3898,7 @@ fn scan_cursor_context(tokens: &[SqlToken], cursor_token_len: usize) -> CursorSc
                                 current_phase,
                             )
                             || from_belongs_to_distinct_predicate
+                            || from_belongs_to_nth_value_modifier
                         {
                             relation_state.clear();
                         } else {

src/ui/intellisense_context/tests.rs

@@ -3149,6 +3149,17 @@ fn multiset_intersect_inside_expression_keeps_where_phase_and_table_scope() {
     );
 }
 
+#[test]
+fn nth_value_from_last_does_not_start_the_query_from_clause() {
+    let ctx = analyze(
+        "SELECT NTH_VALUE(sal, 1) FROM LAST IGNORE NULLS \
+         OVER (PARTITION BY deptno ORDER BY hiredate), | FROM emp",
+    );
+
+    assert_eq!(ctx.phase, SqlPhase::SelectList);
+    assert!(has_name(&table_names(&ctx), "EMP"));
+}
+
 // ─── Qualifier resolution tests ──────────────────────────────────────────
 
 #[test]

src/ui/sql_editor/execution.rs

@@ -30830,7 +30830,7 @@ DROP TEMPORARY TABLE IF EXISTS qt_result_route_monitor;
         assert_formatted_mysql_fixture_scripts_run_without_errors(
             DatabaseType::MySQL,
             "test_mysql",
-            11,
+            12,
         );
     }
 
@@ -30844,7 +30844,7 @@ DROP TEMPORARY TABLE IF EXISTS qt_result_route_monitor;
         assert_formatted_mysql_fixture_scripts_run_without_errors(
             DatabaseType::MariaDB,
             "test_mariadb",
-            13,
+            14,
         );
     }
 
@@ -33702,7 +33702,7 @@ mod mysql_transaction_feedback_tests {
             })
             .collect::<Vec<_>>();
         fixture_paths.sort();
-        assert_eq!(fixture_paths.len(), 42, "Oracle fixture inventory changed");
+        assert_eq!(fixture_paths.len(), 43, "Oracle fixture inventory changed");
 
         let mut audit_failures = Vec::new();
         for path in fixture_paths {

src/ui/sql_editor/format_sweep_tests.rs

@@ -3764,19 +3764,22 @@ fn formatting_sweep_generate_out_report_from_env() {
 #[test]
 #[ignore = "audits every SQL fixture and writes reports under target/format-sweep"]
 fn formatting_sweep_all_files_generate_out_report() {
-    for layout in [SqlCommaListLayout::Wrapped, SqlCommaListLayout::Stacked] {
-        formatting_sweep_all_files_generate_out_report_for_layout(layout);
-    }
+    let checked_files = [SqlCommaListLayout::Wrapped, SqlCommaListLayout::Stacked]
+        .into_iter()
+        .map(formatting_sweep_all_files_generate_out_report_for_layout)
+        .sum::<usize>();
 
     let output_root = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("target/format-sweep");
     fs::write(
         output_root.join("format-sweep.out"),
-        "Auto-format sweep aggregate\ncomma_list_layouts=[Wrapped, Stacked]\nchecked_files=132\nfailures=0\nwrapped_report=wrapped/format-sweep.out\nstacked_report=stacked/format-sweep.out\n",
+        format!(
+            "Auto-format sweep aggregate\ncomma_list_layouts=[Wrapped, Stacked]\nchecked_files={checked_files}\nfailures=0\nwrapped_report=wrapped/format-sweep.out\nstacked_report=stacked/format-sweep.out\n"
+        ),
     )
     .expect("write combined format sweep aggregate");
 }
 
-fn formatting_sweep_all_files_generate_out_report_for_layout(layout: SqlCommaListLayout) {
+fn formatting_sweep_all_files_generate_out_report_for_layout(layout: SqlCommaListLayout) -> usize {
     let manifest = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     let layout_dir = match layout {
         SqlCommaListLayout::Wrapped => "wrapped",
@@ -3961,6 +3964,7 @@ fn formatting_sweep_all_files_generate_out_report_for_layout(layout: SqlCommaLis
         managed_frame_kinds, expected_frame_kinds,
         "the complete fixture sweep must exercise every production frame kind"
     );
+    checked_files
 }
 
 #[test]