From bc50dc7737496712463220e662946eb516e36ae1 Mon Sep 17 00:00:00 2001
From: Kevin Partington <platinum.azure@kernelpanicstudios.com>
Date: Wed, 28 Nov 2018 16:21:19 -0600
Subject: [PATCH] Chore: Move ignored-paths, report-translator to lib/util
 (refs #10559) (#11116)

* Chore: Move lib/ignored-paths to lib/util/ignored-paths

* Chore: Move lib/report-translator to lib/util/report-translator
---
 lib/cli-engine.js                         | 2 +-
 lib/linter.js                             | 2 +-
 lib/util/glob-utils.js                    | 2 +-
 lib/{ => util}/ignored-paths.js           | 2 +-
 lib/{ => util}/report-translator.js       | 4 ++--
 tests/lib/{ => util}/ignored-paths.js     | 2 +-
 tests/lib/{ => util}/report-translator.js | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename lib/{ => util}/ignored-paths.js (99%)
 rename lib/{ => util}/report-translator.js (99%)
 rename tests/lib/{ => util}/ignored-paths.js (99%)
 rename tests/lib/{ => util}/report-translator.js (99%)

diff --git a/lib/cli-engine.js b/lib/cli-engine.js
index 652d68b59b4..ce9fe289b8c 100644
--- a/lib/cli-engine.js
+++ b/lib/cli-engine.js
@@ -20,7 +20,7 @@ const fs = require("fs"),
     defaultOptions = require("../conf/default-cli-options"),
     Linter = require("./linter"),
     lodash = require("lodash"),
-    IgnoredPaths = require("./ignored-paths"),
+    IgnoredPaths = require("./util/ignored-paths"),
     Config = require("./config"),
     ConfigOps = require("./config/config-ops"),
     LintResultCache = require("./util/lint-result-cache"),
diff --git a/lib/linter.js b/lib/linter.js
index 84a53784a5c..f37842d7682 100644
--- a/lib/linter.js
+++ b/lib/linter.js
@@ -21,7 +21,7 @@ const eslintScope = require("eslint-scope"),
     NodeEventGenerator = require("./util/node-event-generator"),
     SourceCode = require("./util/source-code"),
     Traverser = require("./util/traverser"),
-    createReportTranslator = require("./report-translator"),
+    createReportTranslator = require("./util/report-translator"),
     Rules = require("./rules"),
     timing = require("./util/timing"),
     ConfigCommentParser = require("./util/config-comment-parser"),
diff --git a/lib/util/glob-utils.js b/lib/util/glob-utils.js
index a2be0f0425c..fd4cfa00851 100644
--- a/lib/util/glob-utils.js
+++ b/lib/util/glob-utils.js
@@ -14,7 +14,7 @@ const lodash = require("lodash"),
     GlobSync = require("./glob"),
 
     pathUtils = require("./path-utils"),
-    IgnoredPaths = require("../ignored-paths");
+    IgnoredPaths = require("./ignored-paths");
 
 const debug = require("debug")("eslint:glob-utils");
 
diff --git a/lib/ignored-paths.js b/lib/util/ignored-paths.js
similarity index 99%
rename from lib/ignored-paths.js
rename to lib/util/ignored-paths.js
index 8520090af52..34b5f521354 100644
--- a/lib/ignored-paths.js
+++ b/lib/util/ignored-paths.js
@@ -12,7 +12,7 @@
 const fs = require("fs"),
     path = require("path"),
     ignore = require("ignore"),
-    pathUtils = require("./util/path-utils");
+    pathUtils = require("./path-utils");
 
 const debug = require("debug")("eslint:ignored-paths");
 
diff --git a/lib/report-translator.js b/lib/util/report-translator.js
similarity index 99%
rename from lib/report-translator.js
rename to lib/util/report-translator.js
index f828305860f..3dfdca0e494 100644
--- a/lib/report-translator.js
+++ b/lib/util/report-translator.js
@@ -10,8 +10,8 @@
 //------------------------------------------------------------------------------
 
 const assert = require("assert");
-const ruleFixer = require("./util/rule-fixer");
-const interpolate = require("./util/interpolate");
+const ruleFixer = require("./rule-fixer");
+const interpolate = require("./interpolate");
 
 //------------------------------------------------------------------------------
 // Typedefs
diff --git a/tests/lib/ignored-paths.js b/tests/lib/util/ignored-paths.js
similarity index 99%
rename from tests/lib/ignored-paths.js
rename to tests/lib/util/ignored-paths.js
index b03314e6171..7f3ff4387c1 100644
--- a/tests/lib/ignored-paths.js
+++ b/tests/lib/util/ignored-paths.js
@@ -12,7 +12,7 @@
 const assert = require("chai").assert,
     path = require("path"),
     os = require("os"),
-    IgnoredPaths = require("../../lib/ignored-paths.js"),
+    IgnoredPaths = require("../../../lib/util/ignored-paths.js"),
     sinon = require("sinon"),
     fs = require("fs"),
     includes = require("lodash").includes;
diff --git a/tests/lib/report-translator.js b/tests/lib/util/report-translator.js
similarity index 99%
rename from tests/lib/report-translator.js
rename to tests/lib/util/report-translator.js
index e009e4e821a..cd600934d55 100644
--- a/tests/lib/report-translator.js
+++ b/tests/lib/util/report-translator.js
@@ -9,9 +9,9 @@
 //------------------------------------------------------------------------------
 
 const assert = require("chai").assert;
-const SourceCode = require("../../lib/util/source-code");
+const SourceCode = require("../../../lib/util/source-code");
 const espree = require("espree");
-const createReportTranslator = require("../../lib/report-translator");
+const createReportTranslator = require("../../../lib/util/report-translator");
 
 //------------------------------------------------------------------------------
 // Tests