Removed Derefing of backing symbols in annotated symbols

SpontanCombust · Aug 17, 2024 · a917796 · a917796
1 parent 3c21e7f
commit a917796
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 60 deletions.
diff --git a/crates/analysis/src/symbol_analysis/symbols/annotated_symbols.rs b/crates/analysis/src/symbol_analysis/symbols/annotated_symbols.rs
@@ -1,14 +1,12 @@
-use shrinkwraprs::Shrinkwrap;
 use witcherscript::ast::WRAPPED_METHOD_NAME;
 use crate::symbol_analysis::symbol_path::SymbolPath;
 use super::*;
 
 
 /// Corresponding to @addMethod(Class) functions
-#[derive(Debug, Clone, Shrinkwrap)]
-#[shrinkwrap(mutable)]
+#[derive(Debug, Clone)]
 pub struct MemberFunctionInjectorSymbol {
-    pub inner: MemberFunctionSymbol
+    pub backer: MemberFunctionSymbol
 }
 
 impl Symbol for MemberFunctionInjectorSymbol {
@@ -17,33 +15,32 @@ impl Symbol for MemberFunctionInjectorSymbol {
     }
 
     fn path(&self) -> &SymbolPath {
-        &self.inner.path()
+        &self.backer.path()
     }
 }
 
 impl LocatableSymbol for MemberFunctionInjectorSymbol {
     fn location(&self) -> &SymbolLocation {
-        &self.inner.location()
+        &self.backer.location()
     }
 }
 
 impl PrimarySymbol for MemberFunctionInjectorSymbol { }
 
 impl MemberFunctionInjectorSymbol {
-    pub fn new(inner: MemberFunctionSymbol) -> Self {
+    pub fn new(backer: MemberFunctionSymbol) -> Self {
         Self {
-            inner
+            backer
         }
     }
 }
 
 
 
 /// Corresponding to @replaceMethod(Class) functions
-#[derive(Debug, Clone, Shrinkwrap)]
-#[shrinkwrap(mutable)]
+#[derive(Debug, Clone)]
 pub struct MemberFunctionReplacerSymbol {
-    pub inner: MemberFunctionSymbol
+    pub backer: MemberFunctionSymbol
 }
 
 impl Symbol for MemberFunctionReplacerSymbol {
@@ -52,33 +49,32 @@ impl Symbol for MemberFunctionReplacerSymbol {
     }
 
     fn path(&self) -> &SymbolPath {
-        &self.inner.path()
+        &self.backer.path()
     }
 }
 
 impl LocatableSymbol for MemberFunctionReplacerSymbol {
     fn location(&self) -> &SymbolLocation {
-        &self.inner.location()
+        &self.backer.location()
     }
 }
 
 impl PrimarySymbol for MemberFunctionReplacerSymbol { }
 
 impl MemberFunctionReplacerSymbol {
-    pub fn new(inner: MemberFunctionSymbol) -> Self {
+    pub fn new(backer: MemberFunctionSymbol) -> Self {
         Self {
-            inner
+            backer
         }
     }
 }
 
 
 
 /// Corresponding to @replaceMethod functions
-#[derive(Debug, Clone, Shrinkwrap)]
-#[shrinkwrap(mutable)]
+#[derive(Debug, Clone)]
 pub struct GlobalFunctionReplacerSymbol {
-    pub inner: GlobalFunctionSymbol
+    pub backer: GlobalFunctionSymbol
 }
 
 impl Symbol for GlobalFunctionReplacerSymbol {
@@ -87,33 +83,32 @@ impl Symbol for GlobalFunctionReplacerSymbol {
     }
 
     fn path(&self) -> &SymbolPath {
-        &self.inner.path()
+        &self.backer.path()
     }
 }
 
 impl LocatableSymbol for GlobalFunctionReplacerSymbol {
     fn location(&self) -> &SymbolLocation {
-        &self.inner.location()
+        &self.backer.location()
     }
 }
 
 impl PrimarySymbol for GlobalFunctionReplacerSymbol { }
 
 impl GlobalFunctionReplacerSymbol {
-    pub fn new(inner: GlobalFunctionSymbol) -> Self {
+    pub fn new(backer: GlobalFunctionSymbol) -> Self {
         Self {
-            inner
+            backer
         }
     }
 }
 
 
 
 /// Corresponding to @wrapMethod(Class) functions
-#[derive(Debug, Clone, Shrinkwrap)]
-#[shrinkwrap(mutable)]
+#[derive(Debug, Clone)]
 pub struct MemberFunctionWrapperSymbol {
-    pub inner: MemberFunctionSymbol
+    pub backer: MemberFunctionSymbol
 }
 
 impl Symbol for MemberFunctionWrapperSymbol {
@@ -122,22 +117,22 @@ impl Symbol for MemberFunctionWrapperSymbol {
     }
 
     fn path(&self) -> &SymbolPath {
-        &self.inner.path()
+        &self.backer.path()
     }
 }
 
 impl LocatableSymbol for MemberFunctionWrapperSymbol {
     fn location(&self) -> &SymbolLocation {
-        &self.inner.location()
+        &self.backer.location()
     }
 }
 
 impl PrimarySymbol for MemberFunctionWrapperSymbol { }
 
 impl MemberFunctionWrapperSymbol {
-    pub fn new(inner: MemberFunctionSymbol) -> Self {
+    pub fn new(backer: MemberFunctionSymbol) -> Self {
         Self {
-            inner
+            backer
         }
     }
 }
@@ -176,10 +171,9 @@ impl WrappedMethodSymbol {
 
 
 /// Corresponding to @addField(Class) vars
-#[derive(Debug, Clone, Shrinkwrap)]
-#[shrinkwrap(mutable)]
+#[derive(Debug, Clone)]
 pub struct MemberVarInjectorSymbol {
-    pub inner: MemberVarSymbol
+    pub backer: MemberVarSymbol
 }
 
 impl Symbol for MemberVarInjectorSymbol {
@@ -188,22 +182,22 @@ impl Symbol for MemberVarInjectorSymbol {
     }
 
     fn path(&self) -> &SymbolPath {
-        &self.inner.path()
+        &self.backer.path()
     }
 }
 
 impl LocatableSymbol for MemberVarInjectorSymbol {
     fn location(&self) -> &SymbolLocation {
-        &self.inner.location()
+        &self.backer.location()
     }
 }
 
 impl PrimarySymbol for MemberVarInjectorSymbol { }
 
 impl MemberVarInjectorSymbol {
-    pub fn new(inner: MemberVarSymbol) -> Self {
+    pub fn new(backer: MemberVarSymbol) -> Self {
         Self {
-            inner
+            backer
         }
     }
 }
diff --git a/crates/analysis/src/utils/visitors/expr_evaluator.rs b/crates/analysis/src/utils/visitors/expr_evaluator.rs
@@ -125,16 +125,16 @@ impl<'a> ExpressionEvaluator<'a> {
                 },
                 SymbolVariant::ParentVar(s) => s.type_path().to_owned(),
                 SymbolVariant::VirtualParentVar(s) => s.type_path().to_owned(),
-                SymbolVariant::MemberFuncInjector(s) => s.return_type_path.clone().into(),
-                SymbolVariant::MemberFuncReplacer(s) => s.return_type_path.clone().into(),
-                SymbolVariant::GlobalFuncReplacer(s) => s.return_type_path.clone().into(),
-                SymbolVariant::MemberFuncWrapper(s) => s.return_type_path.clone().into(),
-                SymbolVariant::MemberVarInjector(s) => s.type_path.clone().into(),
+                SymbolVariant::MemberFuncInjector(s) => s.backer.return_type_path.clone().into(),
+                SymbolVariant::MemberFuncReplacer(s) => s.backer.return_type_path.clone().into(),
+                SymbolVariant::GlobalFuncReplacer(s) => s.backer.return_type_path.clone().into(),
+                SymbolVariant::MemberFuncWrapper(s) => s.backer.return_type_path.clone().into(),
+                SymbolVariant::MemberVarInjector(s) => s.backer.type_path.clone().into(),
                 SymbolVariant::WrappedMethod(s) => {
                     self.symtab_marcher
                         .get_symbol(s.wrapped_path())
                         .and_then(|v| v.try_as_member_func_wrapper_ref())
-                        .map(|wrapper| wrapper.return_type_path.clone().into())
+                        .map(|wrapper| wrapper.backer.return_type_path.clone().into())
                         .unwrap_or(SymbolPathBuf::unknown(SymbolCategory::Type))
                 }
             }

diff --git a/crates/lsp/src/providers/document_symbols.rs b/crates/lsp/src/providers/document_symbols.rs
@@ -411,35 +411,35 @@ impl ToDocumentSymbol for ConstructorSymbol {
 impl ToDocumentSymbol for MemberFunctionInjectorSymbol {
     #[inline]
     fn to_doc_sym(&self) -> Option<lsp::DocumentSymbol> {
-        self.inner.to_doc_sym()
+        self.backer.to_doc_sym()
     }
 }
 
 impl ToDocumentSymbol for MemberFunctionReplacerSymbol {
     #[inline]
     fn to_doc_sym(&self) -> Option<lsp::DocumentSymbol> {
-        self.inner.to_doc_sym()
+        self.backer.to_doc_sym()
     }
 }
 
 impl ToDocumentSymbol for GlobalFunctionReplacerSymbol {
     #[inline]
     fn to_doc_sym(&self) -> Option<lsp::DocumentSymbol> {
-        self.inner.to_doc_sym()
+        self.backer.to_doc_sym()
     }
 }
 
 impl ToDocumentSymbol for MemberFunctionWrapperSymbol {
     #[inline]
     fn to_doc_sym(&self) -> Option<lsp::DocumentSymbol> {
-        self.inner.to_doc_sym()
+        self.backer.to_doc_sym()
     }
 }
 
 impl ToDocumentSymbol for MemberVarInjectorSymbol {
     #[inline]
     fn to_doc_sym(&self) -> Option<lsp::DocumentSymbol> {
-        self.inner.to_doc_sym()
+        self.backer.to_doc_sym()
     }
 }
 

diff --git a/crates/lsp/src/providers/hover.rs b/crates/lsp/src/providers/hover.rs
@@ -737,13 +737,13 @@ impl RenderTooltip for MemberFunctionInjectorSymbol {
         buf.push(')');
         buf.push('\n');
 
-        for spec in self.specifiers.iter() {
+        for spec in self.backer.specifiers.iter() {
             let kw: Keyword = spec.into();
             buf.push_str(kw.as_ref());
             buf.push(' ');
         }
 
-        if let Some(flavour) = self.flavour.clone() {
+        if let Some(flavour) = self.backer.flavour.clone() {
             let kw: Keyword = flavour.into();
             buf.push_str(kw.as_ref());
             buf.push(' ');
@@ -783,7 +783,7 @@ impl RenderTooltip for MemberFunctionInjectorSymbol {
         buf.push(' ');
         buf.push(':');
         buf.push(' ');
-        buf.push_str(self.return_type_name()); 
+        buf.push_str(self.backer.return_type_name()); 
     }
 }
 
@@ -795,13 +795,13 @@ impl RenderTooltip for MemberFunctionReplacerSymbol {
         buf.push(')');
         buf.push('\n');
 
-        for spec in self.specifiers.iter() {
+        for spec in self.backer.specifiers.iter() {
             let kw: Keyword = spec.into();
             buf.push_str(kw.as_ref());
             buf.push(' ');
         }
 
-        if let Some(flavour) = self.flavour.clone() {
+        if let Some(flavour) = self.backer.flavour.clone() {
             let kw: Keyword = flavour.into();
             buf.push_str(kw.as_ref());
             buf.push(' ');
@@ -841,7 +841,7 @@ impl RenderTooltip for MemberFunctionReplacerSymbol {
         buf.push(' ');
         buf.push(':');
         buf.push(' ');
-        buf.push_str(self.return_type_name()); 
+        buf.push_str(self.backer.return_type_name()); 
     }
 }
 
@@ -850,13 +850,13 @@ impl RenderTooltip for GlobalFunctionReplacerSymbol {
         buf.push_str(AnnotationKind::ReplaceMethod.as_ref());
         buf.push('\n');
 
-        for spec in self.specifiers.iter() {
+        for spec in self.backer.specifiers.iter() {
             let kw: Keyword = spec.into();
             buf.push_str(kw.as_ref());
             buf.push(' ');
         }
 
-        if let Some(flavour) = self.flavour.clone() {
+        if let Some(flavour) = self.backer.flavour.clone() {
             let kw: Keyword = flavour.into();
             buf.push_str(kw.as_ref());
             buf.push(' ');
@@ -890,13 +890,13 @@ impl RenderTooltip for GlobalFunctionReplacerSymbol {
             buf.push_str(", ");
             param.render_partial(buf);
         }
-        
+
         buf.push(')');
 
         buf.push(' ');
         buf.push(':');
         buf.push(' ');
-        buf.push_str(self.return_type_name()); 
+        buf.push_str(self.backer.return_type_name()); 
     }
 }
 
@@ -944,7 +944,7 @@ impl RenderTooltip for MemberFunctionWrapperSymbol {
         buf.push(' ');
         buf.push(':');
         buf.push(' ');
-        buf.push_str(self.return_type_name()); 
+        buf.push_str(self.backer.return_type_name()); 
     }
 }
 
@@ -956,7 +956,7 @@ impl RenderTooltip for MemberVarInjectorSymbol {
         buf.push(')');
         buf.push('\n');
 
-        for spec in self.specifiers.iter() {
+        for spec in self.backer.specifiers.iter() {
             let kw: Keyword = spec.into();
             buf.push_str(kw.as_ref());
             buf.push(' ');
@@ -968,7 +968,7 @@ impl RenderTooltip for MemberVarInjectorSymbol {
         buf.push(' ');
         buf.push(':');
         buf.push(' ');
-        buf.push_str(self.type_name());
+        buf.push_str(self.backer.type_name());
     }
 }