🦄 refactor: Add more delete_local_ref

caoccao · Mar 22, 2024 · 6a74383 · 6a74383
1 parent 3a8efeb
commit 6a74383
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 15 deletions.
diff --git a/rust/src/ast_utils.rs b/rust/src/ast_utils.rs
@@ -155,13 +155,16 @@ impl JavaAstTokenFactory {
     'local: 'a,
   {
     let java_ast_token_type = unsafe { JAVA_AST_TOKEN_TYPE.as_ref().unwrap() };
-    let ast_token_type = java_ast_token_type.parse(env, ast_token_type.get_id());
+    let java_ast_token_type = java_ast_token_type.parse(env, ast_token_type.get_id());
+    let ast_token_type = jvalue {
+      l: java_ast_token_type.as_raw(),
+    };
     let start_position = jvalue { i: range.start as i32 };
     let end_position = jvalue { i: range.end as i32 };
     let line_break_ahead = jvalue {
       z: line_break_ahead as u8,
     };
-    unsafe {
+    let token = unsafe {
       env
         .call_static_method_unchecked(
           &self.class,
@@ -172,7 +175,11 @@ impl JavaAstTokenFactory {
         .expect("Couldn't create Swc4jAstTokenAssignOperator")
         .l()
         .expect("Couldn't convert Swc4jAstTokenAssignOperator")
-    }
+    };
+    env
+      .delete_local_ref(java_ast_token_type)
+      .expect("Couldn't delete local ast token type");
+    token
   }
 
   pub fn create_binary_operator<'local, 'a>(
@@ -186,13 +193,16 @@ impl JavaAstTokenFactory {
     'local: 'a,
   {
     let java_ast_token_type = unsafe { JAVA_AST_TOKEN_TYPE.as_ref().unwrap() };
-    let ast_token_type = java_ast_token_type.parse(env, ast_token_type.get_id());
+    let java_ast_token_type = java_ast_token_type.parse(env, ast_token_type.get_id());
+    let ast_token_type = jvalue {
+      l: java_ast_token_type.as_raw(),
+    };
     let start_position = jvalue { i: range.start as i32 };
     let end_position = jvalue { i: range.end as i32 };
     let line_break_ahead = jvalue {
       z: line_break_ahead as u8,
     };
-    unsafe {
+    let token = unsafe {
       env
         .call_static_method_unchecked(
           &self.class,
@@ -203,7 +213,11 @@ impl JavaAstTokenFactory {
         .expect("Couldn't create Swc4jAstTokenBinaryOperator")
         .l()
         .expect("Couldn't convert Swc4jAstTokenBinaryOperator")
-    }
+    };
+    env
+      .delete_local_ref(java_ast_token_type)
+      .expect("Couldn't delete local ast token type");
+    token
   }
 
   pub fn create_false<'local, 'a>(
@@ -245,13 +259,16 @@ impl JavaAstTokenFactory {
     'local: 'a,
   {
     let java_ast_token_type = unsafe { JAVA_AST_TOKEN_TYPE.as_ref().unwrap() };
-    let ast_token_type = java_ast_token_type.parse(env, ast_token_type.get_id());
+    let java_ast_token_type = java_ast_token_type.parse(env, ast_token_type.get_id());
+    let ast_token_type = jvalue {
+      l: java_ast_token_type.as_raw(),
+    };
     let start_position = jvalue { i: range.start as i32 };
     let end_position = jvalue { i: range.end as i32 };
     let line_break_ahead = jvalue {
       z: line_break_ahead as u8,
     };
-    unsafe {
+    let token = unsafe {
       env
         .call_static_method_unchecked(
           &self.class,
@@ -262,7 +279,11 @@ impl JavaAstTokenFactory {
         .expect("Couldn't create Swc4jAstTokenGenericOperator")
         .l()
         .expect("Couldn't convert Swc4jAstTokenGenericOperator")
-    }
+    };
+    env
+      .delete_local_ref(java_ast_token_type)
+      .expect("Couldn't delete local ast token type");
+    token
   }
 
   pub fn create_ident_known<'local, 'a>(
@@ -311,13 +332,16 @@ impl JavaAstTokenFactory {
     'local: 'a,
   {
     let java_ast_token_type = unsafe { JAVA_AST_TOKEN_TYPE.as_ref().unwrap() };
-    let ast_token_type = java_ast_token_type.parse(env, ast_token_type.get_id());
+    let java_ast_token_type = java_ast_token_type.parse(env, ast_token_type.get_id());
+    let ast_token_type = jvalue {
+      l: java_ast_token_type.as_raw(),
+    };
     let start_position = jvalue { i: range.start as i32 };
     let end_position = jvalue { i: range.end as i32 };
     let line_break_ahead = jvalue {
       z: line_break_ahead as u8,
     };
-    unsafe {
+    let token = unsafe {
       env
         .call_static_method_unchecked(
           &self.class,
@@ -328,7 +352,11 @@ impl JavaAstTokenFactory {
         .expect("Couldn't create Swc4jAstTokenKeyword")
         .l()
         .expect("Couldn't convert Swc4jAstTokenKeyword")
-    }
+    };
+    env
+      .delete_local_ref(java_ast_token_type)
+      .expect("Couldn't delete local ast token type");
+    token
   }
 
   pub fn create_null<'local, 'a>(

diff --git a/rust/src/enums.rs b/rust/src/enums.rs
@@ -427,7 +427,7 @@ impl AstTokenType {
       Token::PlusPlus => AstTokenType::PlusPlus,
       Token::MinusMinus => AstTokenType::MinusMinus,
       Token::Tilde => AstTokenType::Tilde,
-      _ => AstTokenType::Unknown,
+      _ => panic!("Unexpected token {:?}", token),
     }
   }
 
@@ -507,13 +507,17 @@ impl JavaAstTokenType {
     AstTokenType::parse_by_id(id)
   }
 
-  pub fn parse<'local>(&self, env: &mut JNIEnv<'local>, id: i32) -> jvalue {
+  pub fn parse<'local, 'a>(&self, env: &mut JNIEnv<'local>, id: i32) -> JObject<'a>
+  where
+    'local: 'a,
+  {
     let id = jvalue { i: id };
     unsafe {
       env
         .call_static_method_unchecked(&self.class, self.method_parse, ReturnType::Object, &[id])
         .expect("Object is expected")
-        .as_jni()
+        .l()
+        .expect("Couldn't convert to JObject")
     }
   }
 }