tools: fix check-imports.py to match on word boundaries

Makefile

@@ -1328,13 +1328,13 @@ else
 CPPLINT_QUIET = --quiet
 endif
 .PHONY: lint-cpp
-# Lints the C++ code with cpplint.py and check-imports.py.
+# Lints the C++ code with cpplint.py and checkimports.py.
 lint-cpp: tools/.cpplintstamp
 
 tools/.cpplintstamp: $(LINT_CPP_FILES)
 	@echo "Running C++ linter..."
 	@$(PYTHON) tools/cpplint.py $(CPPLINT_QUIET) $?
-	@$(PYTHON) tools/check-imports.py
+	@$(PYTHON) tools/checkimports.py
 	@touch $@
 
 .PHONY: lint-addon-docs

src/async_wrap.cc

@@ -39,7 +39,6 @@ using v8::HandleScope;
 using v8::Integer;
 using v8::Isolate;
 using v8::Local;
-using v8::Maybe;
 using v8::MaybeLocal;
 using v8::Name;
 using v8::Number;

src/heap_utils.cc

@@ -15,7 +15,6 @@ using v8::Global;
 using v8::HandleScope;
 using v8::HeapSnapshot;
 using v8::Isolate;
-using v8::JSON;
 using v8::Local;
 using v8::MaybeLocal;
 using v8::Number;

src/inspector_agent.cc

@@ -45,8 +45,6 @@ using v8::Isolate;
 using v8::Local;
 using v8::Message;
 using v8::Object;
-using v8::String;
-using v8::Task;
 using v8::Value;
 
 using v8_inspector::StringBuffer;

src/inspector_js_api.cc

@@ -12,7 +12,6 @@ namespace node {
 namespace inspector {
 namespace {
 
-using v8::Boolean;
 using v8::Context;
 using v8::Function;
 using v8::FunctionCallbackInfo;

src/module_wrap.cc

@@ -33,9 +33,7 @@ using v8::HandleScope;
 using v8::Integer;
 using v8::IntegrityLevel;
 using v8::Isolate;
-using v8::Just;
 using v8::Local;
-using v8::Maybe;
 using v8::MaybeLocal;
 using v8::Module;
 using v8::Number;

src/node_contextify.cc

@@ -36,7 +36,6 @@ namespace contextify {
 using errors::TryCatchScope;
 
 using v8::Array;
-using v8::ArrayBuffer;
 using v8::ArrayBufferView;
 using v8::Boolean;
 using v8::Context;

src/node_credentials.cc

@@ -15,7 +15,6 @@ namespace node {
 
 using v8::Array;
 using v8::Context;
-using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::HandleScope;
 using v8::Isolate;

src/node_dir.cc

@@ -28,7 +28,6 @@ using fs::GetReqWrap;
 
 using v8::Array;
 using v8::Context;
-using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
 using v8::HandleScope;

src/node_dtrace.cc

@@ -57,7 +57,6 @@ using v8::HandleScope;
 using v8::Isolate;
 using v8::Local;
 using v8::Object;
-using v8::String;
 using v8::Value;
 
 #define SLURP_STRING(obj, member, valp)                                    \

src/node_errors.cc

@@ -25,7 +25,6 @@ using v8::Local;
 using v8::Maybe;
 using v8::MaybeLocal;
 using v8::Message;
-using v8::Number;
 using v8::Object;
 using v8::ScriptOrigin;
 using v8::StackFrame;

src/node_http2.cc

@@ -22,7 +22,6 @@ using v8::ArrayBufferView;
 using v8::Boolean;
 using v8::Context;
 using v8::EscapableHandleScope;
-using v8::Float64Array;
 using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
@@ -35,8 +34,6 @@ using v8::Number;
 using v8::Object;
 using v8::ObjectTemplate;
 using v8::String;
-using v8::Uint32;
-using v8::Uint32Array;
 using v8::Uint8Array;
 using v8::Undefined;
 using v8::Value;

src/node_main_instance.cc

@@ -20,7 +20,6 @@ using v8::HandleScope;
 using v8::Isolate;
 using v8::Local;
 using v8::Locker;
-using v8::Object;
 using v8::SealHandleScope;
 
 NodeMainInstance::NodeMainInstance(Isolate* isolate,

src/node_messaging.cc

@@ -16,7 +16,6 @@ using v8::BackingStore;
 using v8::CompiledWasmModule;
 using v8::Context;
 using v8::EscapableHandleScope;
-using v8::Exception;
 using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;

src/node_native_module.cc

@@ -7,14 +7,11 @@ namespace native_module {
 using v8::Context;
 using v8::EscapableHandleScope;
 using v8::Function;
-using v8::HandleScope;
 using v8::Integer;
 using v8::Isolate;
 using v8::Local;
-using v8::Maybe;
 using v8::MaybeLocal;
 using v8::Object;
-using v8::Script;
 using v8::ScriptCompiler;
 using v8::ScriptOrigin;
 using v8::String;

src/node_native_module_env.cc

@@ -11,7 +11,6 @@ using v8::FunctionCallbackInfo;
 using v8::IntegrityLevel;
 using v8::Isolate;
 using v8::Local;
-using v8::Maybe;
 using v8::MaybeLocal;
 using v8::Name;
 using v8::None;

src/node_options.cc

@@ -18,7 +18,6 @@ using v8::Local;
 using v8::Map;
 using v8::Number;
 using v8::Object;
-using v8::String;
 using v8::Undefined;
 using v8::Value;
 

src/node_perf.cc

@@ -11,7 +11,6 @@
 namespace node {
 namespace performance {
 
-using v8::Array;
 using v8::Context;
 using v8::DontDelete;
 using v8::Function;
@@ -25,14 +24,12 @@ using v8::Isolate;
 using v8::Local;
 using v8::Map;
 using v8::MaybeLocal;
-using v8::Name;
 using v8::NewStringType;
 using v8::Number;
 using v8::Object;
 using v8::PropertyAttribute;
 using v8::ReadOnly;
 using v8::String;
-using v8::Uint32Array;
 using v8::Value;
 
 // Microseconds in a millisecond, as a float.

src/node_process_methods.cc

@@ -36,13 +36,11 @@ using v8::ArrayBuffer;
 using v8::BigUint64Array;
 using v8::Context;
 using v8::Float64Array;
-using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::HeapStatistics;
 using v8::Integer;
 using v8::Isolate;
 using v8::Local;
-using v8::Name;
 using v8::NewStringType;
 using v8::Number;
 using v8::Object;

src/node_process_object.cc

@@ -15,10 +15,8 @@ using v8::EscapableHandleScope;
 using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
-using v8::HandleScope;
 using v8::Integer;
 using v8::Isolate;
-using v8::Just;
 using v8::Local;
 using v8::MaybeLocal;
 using v8::Name;

src/node_report.cc

@@ -41,11 +41,8 @@ using v8::HeapSpaceStatistics;
 using v8::HeapStatistics;
 using v8::Isolate;
 using v8::Local;
-using v8::Number;
-using v8::StackTrace;
 using v8::String;
 using v8::V8;
-using v8::Value;
 
 namespace per_process = node::per_process;
 

src/node_report_module.cc

@@ -18,9 +18,7 @@ namespace report {
 using node::Environment;
 using node::Mutex;
 using node::Utf8Value;
-using v8::Boolean;
 using v8::Context;
-using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::HandleScope;
 using v8::Isolate;

src/node_util.cc

@@ -10,7 +10,6 @@ using v8::Array;
 using v8::ArrayBufferView;
 using v8::Boolean;
 using v8::Context;
-using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
 using v8::Global;

src/node_zlib.cc

@@ -43,7 +43,6 @@
 
 namespace node {
 
-using v8::Array;
 using v8::ArrayBuffer;
 using v8::Context;
 using v8::Function;
@@ -56,7 +55,6 @@ using v8::Integer;
 using v8::Local;
 using v8::Object;
 using v8::String;
-using v8::Uint32;
 using v8::Uint32Array;
 using v8::Value;
 

src/pipe_wrap.cc

@@ -39,7 +39,6 @@ using v8::EscapableHandleScope;
 using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
-using v8::HandleScope;
 using v8::Int32;
 using v8::Isolate;
 using v8::Local;

src/tcp_wrap.cc

@@ -42,7 +42,6 @@ using v8::EscapableHandleScope;
 using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
-using v8::HandleScope;
 using v8::Int32;
 using v8::Integer;
 using v8::Local;

src/tls_wrap.cc

@@ -47,7 +47,6 @@ using v8::HandleScope;
 using v8::Integer;
 using v8::Isolate;
 using v8::Local;
-using v8::Maybe;
 using v8::MaybeLocal;
 using v8::Object;
 using v8::PropertyAttribute;

src/tty_wrap.cc

@@ -32,7 +32,6 @@ namespace node {
 
 using v8::Array;
 using v8::Context;
-using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
 using v8::Integer;

test/fixtures/tools/checkimports/invalid.cc

@@ -0,0 +1,7 @@
+using v8::MaybeLocal;
+using v8::Array;
+using v8::Local;
+
+MaybeLocal<Array> CreateObject() const {
+  return MaybeLocal<Array>();
+}

test/fixtures/tools/checkimports/maybe.cc

@@ -0,0 +1,7 @@
+using v8::Array;
+using v8::Local;
+using v8::MaybeLocal;
+
+MaybeLocal<Array> CreateObject() const {
+  return MaybeLocal<Array>();
+}

test/fixtures/tools/checkimports/unsorted.cc

@@ -0,0 +1,6 @@
+using v8::MaybeLocal;
+using v8::Array;
+
+MaybeLocal<Array> CreateObject() const {
+  return MaybeLocal<Array>();
+}

test/fixtures/tools/checkimports/unused.cc

@@ -0,0 +1,5 @@
+using v8::Context;
+
+static void MyMethod(void) {
+  return;
+}

test/fixtures/tools/checkimports/valid.cc

@@ -0,0 +1,6 @@
+using v8::Array;
+using v8::MaybeLocal;
+
+MaybeLocal<Array> CreateObject() const {
+  return MaybeLocal<Array>();
+}