Remove unneeded Napi::HandleScope objects (nodejs#144)

jschlight · web-flow · commit 3ccbb6af8686 · 2020-07-03T16:43:56.000-04:00
* Remove unneeded Napi::HandleScope objects
diff --git a/6_object_wrap/node-addon-api/myobject.cc b/6_object_wrap/node-addon-api/myobject.cc
@@ -1,7 +1,6 @@
 #include "myobject.h"
 
 Napi::Object MyObject::Init(Napi::Env env, Napi::Object exports) {
-  Napi::HandleScope scope(env);
 
   Napi::Function func =
       DefineClass(env,
@@ -21,7 +20,6 @@ Napi::Object MyObject::Init(Napi::Env env, Napi::Object exports) {
 MyObject::MyObject(const Napi::CallbackInfo& info)
     : Napi::ObjectWrap<MyObject>(info) {
   Napi::Env env = info.Env();
-  Napi::HandleScope scope(env);
 
   int length = info.Length();
 
diff --git a/7_factory_wrap/node-addon-api/myobject.cc b/7_factory_wrap/node-addon-api/myobject.cc
@@ -5,7 +5,6 @@
 using namespace Napi;
 
 Napi::Object MyObject::Init(Napi::Env env, Napi::Object exports) {
-  Napi::HandleScope scope(env);
 
   Napi::Function func = DefineClass(
       env, "MyObject", {InstanceMethod("plusOne", &MyObject::PlusOne)});
@@ -20,8 +19,6 @@ Napi::Object MyObject::Init(Napi::Env env, Napi::Object exports) {
 
 MyObject::MyObject(const Napi::CallbackInfo& info)
     : Napi::ObjectWrap<MyObject>(info) {
-  Napi::Env env = info.Env();
-  Napi::HandleScope scope(env);
 
   this->counter_ = info[0].As<Napi::Number>().DoubleValue();
 };
diff --git a/8_passing_wrapped/node-addon-api/myobject.cc b/8_passing_wrapped/node-addon-api/myobject.cc
@@ -4,14 +4,11 @@
 
 MyObject::MyObject(const Napi::CallbackInfo& info)
     : Napi::ObjectWrap<MyObject>(info) {
-  Napi::Env env = info.Env();
-  Napi::HandleScope scope(env);
 
   this->val_ = info[0].As<Napi::Number>().DoubleValue();
 };
 
 void MyObject::Init(Napi::Env env, Napi::Object exports) {
-  Napi::HandleScope scope(env);
 
   Napi::Function func = DefineClass(env, "MyObject", {});
 
diff --git a/async_pi_estimate/node-addon-api/async.cc b/async_pi_estimate/node-addon-api/async.cc
@@ -18,7 +18,6 @@ class PiWorker : public Napi::AsyncWorker {
   // this function will be run inside the main event loop
   // so it is safe to use JS engine data again
   void OnOK() {
-    Napi::HandleScope scope(Env());
     Callback().Call({Env().Undefined(), Napi::Number::New(Env(), estimate)});
   }
 
diff --git a/function-reference-demo/node-addon-api/src/native-addon.cc b/function-reference-demo/node-addon-api/src/native-addon.cc
@@ -4,7 +4,6 @@
 Napi::FunctionReference NativeAddon::constructor;
 
 Napi::Object NativeAddon::Init(Napi::Env env, Napi::Object exports) {
-  Napi::HandleScope scope(env);
   
   Napi::Function func = DefineClass(env, "NativeAddon", {
     InstanceMethod("tryCallByStoredReference", &NativeAddon::TryCallByStoredReference),
diff --git a/inherits_from_event_emitter/node-addon-api/src/native-emitter.cc b/inherits_from_event_emitter/node-addon-api/src/native-emitter.cc
@@ -7,8 +7,7 @@
 Napi::FunctionReference NativeEmitter::constructor;
 
 Napi::Object NativeEmitter::Init(Napi::Env env, Napi::Object exports) {
-  Napi::HandleScope scope(env);
-
+  
   Napi::Function func =
       DefineClass(env,
                   "NativeEmitter",

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ class PiWorker : public Napi::AsyncWorker {`
`18`	`18`	`// this function will be run inside the main event loop`
`19`	`19`	`// so it is safe to use JS engine data again`
`20`	`20`	`void OnOK() {`
`21`		`- Napi::HandleScope scope(Env());`
`22`	`21`	`Callback().Call({Env().Undefined(), Napi::Number::New(Env(), estimate)});`
`23`	`22`	`}`
`24`	`23`