update after reviewing again

XadillaX · XadillaX · commit 876ab6ef2e29 · 2017-06-21T10:52:05.000+08:00
diff --git a/lib/repl.js b/lib/repl.js
@@ -690,7 +690,7 @@ function intFilter(item) {
   return /^[A-Za-z_$]/.test(item);
 }
 
-const DEFAULT_PROPERTIES = {
+const defaultProperties = {
   ARRAY: Object.getOwnPropertyNames([]).filter(intFilter),
   BUFFER: Object.getOwnPropertyNames(Buffer.alloc(1)).filter(intFilter)
 };
@@ -704,16 +704,16 @@ function filteredOwnPropertyNames(obj) {
   if (mayBeLargeObject(obj) && obj.length > 1e6) {
     this._writeToOutput('\r\n');
     process.emitWarning(
-      'Instance is too large that the completion may missing ' +
-      'some customized properties.',
+      'Instance is too large so the completion may missing some custom ' +
+      'properties.',
       'REPLWarning',
       undefined,
       undefined,
       true);
 
     return Array.isArray(obj) ?
-      DEFAULT_PROPERTIES.ARRAY :
-      DEFAULT_PROPERTIES.BUFFER;
+      defaultProperties.ARRAY :
+      defaultProperties.BUFFER;
   }
   return Object.getOwnPropertyNames(obj).filter(intFilter);
 }
@@ -756,7 +756,6 @@ function complete(line, callback) {
     }
   }
 
-  var self = this;
   var completions;
 
   // list of completion lists, one for each inheritance "level"
@@ -892,13 +891,13 @@ function complete(line, callback) {
         }
       } else {
         const evalExpr = `try { ${expr} } catch (e) {}`;
-        this.eval(evalExpr, this.context, 'repl', function doEval(e, obj) {
+        this.eval(evalExpr, this.context, 'repl', (e, obj) => {
           // if (e) console.log(e);
 
           if (obj != null) {
             if (typeof obj === 'object' || typeof obj === 'function') {
               try {
-                memberGroups.push(filteredOwnPropertyNames.call(self, obj));
+                memberGroups.push(filteredOwnPropertyNames.call(this, obj));
               } catch (ex) {
                 // Probably a Proxy object without `getOwnPropertyNames` trap.
                 // We simply ignore it here, as we don't want to break the
@@ -916,7 +915,7 @@ function complete(line, callback) {
                 p = obj.constructor ? obj.constructor.prototype : null;
               }
               while (p !== null) {
-                memberGroups.push(filteredOwnPropertyNames.call(self, p));
+                memberGroups.push(filteredOwnPropertyNames.call(this, p));
                 p = Object.getPrototypeOf(p);
                 // Circular refs possible? Let's guard against that.
                 sentinel--;
diff --git a/test/parallel/test-repl-tab-complete.js b/test/parallel/test-repl-tab-complete.js
@@ -23,7 +23,6 @@
 
 const common = require('../common');
 const assert = require('assert');
-const Buffer = require('buffer').Buffer;
 
 // We have to change the directory to ../fixtures before requiring repl
 // in order to make the tests for completion of node_modules work properly
@@ -307,6 +306,8 @@ testMe.complete('.b', common.mustCall((error, data) => {
 }));
 
 // tab completion for large buffer
+const warningRegEx =
+  /\(node:\d+\) REPLWarning: Instance is too large so the completion may missing some custom properties\./;
 [ Array, Buffer ].forEach((type) => {
   putIn.run(['.clear']);
 
@@ -317,8 +318,8 @@ testMe.complete('.b', common.mustCall((error, data) => {
   }
 
   common.hijackStderr(common.mustCall((err) => {
-    process.nextTick(function() {
-      assert.ok(/REPLWarning: Instance is too large that the/.test(err));
+    process.nextTick(() => {
+      assert.ok(warningRegEx.test(err));
     });
   }));
   testMe.complete('ele.', common.mustCall((err, data) => {
