Skip to content

Commit c98fe89

Browse files
Anisha Rohramhdawson
authored andcommitted
fix conversion tool which created two return statements when there's an error thrown
PR-URL: #136 Reviewed-By: Michael Dawson <[email protected]>
1 parent 458f576 commit c98fe89

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tools/conversion.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ var SourceFileOperations = [
148148

149149
// Nan::ThrowError(error) to Napi::Error::New(env, error).ThrowAsJavaScriptException()
150150
[ /return Nan::Throw(\w*?)Error\((.+?)\);/g, 'Napi::$1Error::New(env, $2).ThrowAsJavaScriptException();\n return env.Null();' ],
151-
[ /Nan::Throw(\w*?)Error\((.+?)\);/g, 'Napi::$1Error::New(env, $2).ThrowAsJavaScriptException();\n return env.Null();' ],
151+
[ /Nan::Throw(\w*?)Error\((.+?)\);\n(\s*)return;/g, 'Napi::$1Error::New(env, $2).ThrowAsJavaScriptException();\n$3return env.Null();' ],
152+
[ /Nan::Throw(\w*?)Error\((.+?)\);/g, 'Napi::$1Error::New(env, $2).ThrowAsJavaScriptException();\n' ],
152153
// Nan::RangeError(error) to Napi::RangeError::New(env, error)
153154
[ /Nan::(\w*?)Error\((.+)\)/g, 'Napi::$1Error::New(env, $2)' ],
154155

0 commit comments

Comments
 (0)