mergie mergie

Author: juleswritescode

crates/pgt_hover/src/hoverables/column.rs

@@ -63,33 +63,15 @@ impl ContextualPriority for Column {
 
         // high score if we match the specific alias or table being referenced in the cursor context
         if let Some(table_or_alias) = ctx.schema_or_alias_name.as_ref() {
-<<<<<<< HEAD
-            if table_or_alias == self.table_name.as_str() {
-                score += 250.0;
-            } else if let Some(table_name) = ctx.mentioned_table_aliases.get(table_or_alias) {
-=======
             if table_or_alias.replace('"', "") == self.table_name.as_str() {
                 score += 250.0;
             } else if let Some(table_name) = ctx.get_mentioned_table_for_alias(table_or_alias) {
->>>>>>> e2826fb8214a11dd2ac22da770863fbbfe20c5da
                 if table_name == self.table_name.as_str() {
                     score += 250.0;
                 }
             }
         }
 
-<<<<<<< HEAD
-        // medium score if the current column maps to any of the query's mentioned
-        // "(schema.)table" combinations
-        for (schema_opt, tables) in &ctx.mentioned_relations {
-            if tables.contains(&self.table_name) {
-                if schema_opt.as_deref() == Some(&self.schema_name) {
-                    score += 150.0;
-                } else {
-                    score += 100.0;
-                }
-            }
-=======
         if ctx
             .get_mentioned_relations(&Some(self.schema_name.clone()))
             .is_some_and(|t| t.contains(&self.table_name))
@@ -100,7 +82,6 @@ impl ContextualPriority for Column {
             .is_some_and(|t| t.contains(&self.table_name))
         {
             score += 100.0;
->>>>>>> e2826fb8214a11dd2ac22da770863fbbfe20c5da
         }
 
         if self.schema_name == "public" && score == 0.0 {