Skip to content

Commit f785878

Browse files
vemvbbatsov
vemv
authored and
bbatsov
committed
Reformat the project's ns forms
Makes it more consistent with the no-prefix preference #308
1 parent a53e3bc commit f785878

33 files changed

+255
-239
lines changed

‎project.clj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
(defproject refactor-nrepl "3.0.0"
22
:description "nREPL middleware to support editor-agnostic refactoring"
3-
:url "http://github.com/clojure-emacs/refactor-nrepl"
3+
:url "https://github.com/clojure-emacs/refactor-nrepl"
44
:license {:name "Eclipse Public License"
5-
:url "http://www.eclipse.org/legal/epl-v10.html"}
5+
:url "https://www.eclipse.org/legal/epl-v10.html"}
66
:dependencies [[nrepl "0.9.0-beta3"]
77
^:inline-dep [http-kit "2.5.3"]
88
^:inline-dep [org.clojure/data.json "2.3.1"]

‎src/refactor_nrepl/analyzer.clj

+16-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
(ns refactor-nrepl.analyzer
22
(:refer-clojure :exclude [macroexpand-1])
3-
(:require [clojure.java.io :as io]
4-
[clojure.tools.analyzer :as ana]
5-
[clojure.tools.reader :as reader]
6-
[clojure.tools.analyzer.ast :refer [nodes]]
7-
[clojure.tools.analyzer.jvm :as aj]
8-
[clojure.tools.analyzer.jvm.utils :as ajutils]
9-
[clojure.tools.namespace.parse :refer [read-ns-decl]]
10-
[clojure.walk :as walk]
11-
[refactor-nrepl
12-
[config :as config]
13-
[core :as core]
14-
[util :as util]]
15-
[refactor-nrepl.ns.tracker :as tracker])
16-
(:import java.io.PushbackReader
17-
java.util.regex.Pattern))
3+
(:require
4+
[clojure.java.io :as io]
5+
[clojure.tools.analyzer :as ana]
6+
[clojure.tools.analyzer.ast :refer [nodes]]
7+
[clojure.tools.analyzer.jvm :as aj]
8+
[clojure.tools.analyzer.jvm.utils :as ajutils]
9+
[clojure.tools.namespace.parse :refer [read-ns-decl]]
10+
[clojure.tools.reader :as reader]
11+
[clojure.walk :as walk]
12+
[refactor-nrepl.config :as config]
13+
[refactor-nrepl.core :as core]
14+
[refactor-nrepl.ns.tracker :as tracker]
15+
[refactor-nrepl.util :as util])
16+
(:import
17+
(java.io PushbackReader)
18+
(java.util.regex Pattern)))
1819

1920
;;; The structure here is {ns {content-hash ast}}
2021
(def ^:private ast-cache (atom {}))

‎src/refactor_nrepl/artifacts.clj

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
(ns refactor-nrepl.artifacts
2-
(:require [clojure.data.json :as json]
3-
[clojure
4-
[edn :as edn]
5-
[string :as str]]
6-
[clojure.java.io :as io]
7-
[org.httpkit.client :as http]
8-
[version-clj.core :as versions])
9-
(:import java.util.zip.GZIPInputStream))
2+
(:require
3+
[clojure.data.json :as json]
4+
[clojure.edn :as edn]
5+
[clojure.java.io :as io]
6+
[clojure.string :as str]
7+
[org.httpkit.client :as http]
8+
[version-clj.core :as versions])
9+
(:import
10+
(java.util.zip GZIPInputStream)))
1011

1112
(def artifacts-file (str (io/file (System/getProperty "java.io.tmpdir")
1213
"refactor-nrepl-artifacts-cache")))

‎src/refactor_nrepl/extract_definition.clj

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
(ns refactor-nrepl.extract-definition
2-
(:require [clojure.string :as str]
3-
[refactor-nrepl
4-
[core :refer [suffix]]
5-
[s-expressions :as sexp]]
6-
[refactor-nrepl.find.find-symbol :refer [find-symbol]]
7-
[rewrite-clj.zip :as zip])
8-
(:import [java.io PushbackReader StringReader]
9-
java.util.regex.Pattern))
2+
(:require
3+
[clojure.string :as str]
4+
[refactor-nrepl.core :refer [suffix]]
5+
[refactor-nrepl.find.find-symbol :refer [find-symbol]]
6+
[refactor-nrepl.s-expressions :as sexp]
7+
[rewrite-clj.zip :as zip])
8+
(:import
9+
(java.io PushbackReader StringReader)
10+
(java.util.regex Pattern)))
1011

1112
(defn- extract-definition-from-def
1213
^String [^String sexp]

‎src/refactor_nrepl/find/find_locals.clj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
(ns refactor-nrepl.find.find-locals
2-
(:require [clojure.set :as set]
3-
[clojure.tools.analyzer.ast :refer [nodes]]
4-
[refactor-nrepl
5-
[analyzer :as ana]
6-
[s-expressions :as sexp]
7-
[core :as core]]))
2+
(:require
3+
[clojure.set :as set]
4+
[clojure.tools.analyzer.ast :refer [nodes]]
5+
[refactor-nrepl.analyzer :as ana]
6+
[refactor-nrepl.core :as core]
7+
[refactor-nrepl.s-expressions :as sexp]))
88

99
(defn find-used-locals [{:keys [file ^long line ^long column]}]
1010
{:pre [(number? line)

‎src/refactor_nrepl/find/find_macros.clj

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
(ns refactor-nrepl.find.find-macros
2-
(:require [clojure.string :as str]
3-
[clojure.tools.reader :as reader]
4-
[refactor-nrepl
5-
[core :as core]
6-
[s-expressions :as sexp]
7-
[util :as util]]
8-
[refactor-nrepl.find.bindings :as bindings]
9-
[refactor-nrepl.ns
10-
[ns-parser :as ns-parser]
11-
[tracker :as tracker]]
12-
[rewrite-clj.zip :as zip]
13-
[clojure.java.io :as io])
14-
(:import clojure.lang.LineNumberingPushbackReader
15-
[java.io File FileReader StringReader]))
2+
(:require
3+
[clojure.java.io :as io]
4+
[clojure.string :as str]
5+
[clojure.tools.reader :as reader]
6+
[refactor-nrepl.core :as core]
7+
[refactor-nrepl.find.bindings :as bindings]
8+
[refactor-nrepl.ns.ns-parser :as ns-parser]
9+
[refactor-nrepl.ns.tracker :as tracker]
10+
[refactor-nrepl.s-expressions :as sexp]
11+
[refactor-nrepl.util :as util]
12+
[rewrite-clj.zip :as zip])
13+
(:import
14+
(clojure.lang LineNumberingPushbackReader)
15+
(java.io File FileReader StringReader)))
1616

1717
;; The structure here is {path [timestamp macros]}
1818
(def ^:private macro-defs-cache (atom {}))

‎src/refactor_nrepl/find/find_symbol.clj

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
(ns refactor-nrepl.find.find-symbol
2-
(:require [clojure
3-
[set :as set]
4-
[string :as str]]
5-
[refactor-nrepl.util :as util :refer [self-referential?]]
6-
[clojure.tools.analyzer.ast :refer [nodes postwalk]]
7-
[clojure.tools.namespace.parse :as parse]
8-
[refactor-nrepl
9-
[analyzer :as ana]
10-
[core :as core]
11-
[s-expressions :as sexp]]
12-
[refactor-nrepl.find.find-macros :refer [find-macro]]
13-
[refactor-nrepl.find.util :as find-util]
14-
[refactor-nrepl.ns.libspecs :as libspecs]
15-
[clojure.tools.reader :as reader])
16-
(:import (java.io File)))
2+
(:require
3+
[clojure.set :as set]
4+
[clojure.string :as str]
5+
[clojure.tools.analyzer.ast :refer [nodes postwalk]]
6+
[clojure.tools.namespace.parse :as parse]
7+
[clojure.tools.reader :as reader]
8+
[refactor-nrepl.analyzer :as ana]
9+
[refactor-nrepl.core :as core]
10+
[refactor-nrepl.find.find-macros :refer [find-macro]]
11+
[refactor-nrepl.find.util :as find-util]
12+
[refactor-nrepl.ns.libspecs :as libspecs]
13+
[refactor-nrepl.s-expressions :as sexp]
14+
[refactor-nrepl.util :as util :refer [self-referential?]])
15+
(:import
16+
(java.io File)))
1717

1818
(def ^:private symbol-regex #"[\w\.:\*\+\-_!\?]+")
1919

‎src/refactor_nrepl/find/find_used_publics.clj

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
(ns refactor-nrepl.find.find-used-publics
2-
(:require [clojure.set :as set]
3-
[clojure.string :as str]
4-
[clojure.tools.analyzer.ast :refer [nodes]]
5-
[refactor-nrepl.analyzer :as ana]
6-
[refactor-nrepl.find.find-macros :as macros]
7-
[refactor-nrepl.find.util :as find-util]
8-
[refactor-nrepl.core :as core]))
2+
(:require
3+
[clojure.set :as set]
4+
[clojure.string :as str]
5+
[clojure.tools.analyzer.ast :refer [nodes]]
6+
[refactor-nrepl.analyzer :as ana]
7+
[refactor-nrepl.core :as core]
8+
[refactor-nrepl.find.find-macros :as macros]
9+
[refactor-nrepl.find.util :as find-util]))
910

1011
(defn- ns-used-in-node?
1112
[used-ns ast-node]

‎src/refactor_nrepl/find/symbols_in_file.clj

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
(ns refactor-nrepl.find.symbols-in-file
2-
(:require [clojure
3-
[walk :as walk]]
4-
[clojure.tools.reader :as reader]
5-
[clojure.tools.reader.reader-types :as readers]
6-
[refactor-nrepl
7-
[core :as core]
8-
[util :as util]]
9-
[refactor-nrepl.ns.ns-parser :as ns-parser]
10-
[clojure.java.io :as io]))
2+
(:require
3+
[clojure.java.io :as io]
4+
[clojure.tools.reader :as reader]
5+
[clojure.tools.reader.reader-types :as readers]
6+
[clojure.walk :as walk]
7+
[refactor-nrepl.core :as core]
8+
[refactor-nrepl.ns.ns-parser :as ns-parser]
9+
[refactor-nrepl.util :as util]))
1110

1211
(defn- find-symbol-ns [{:keys [:require :require-macros]} sym]
1312
(some->> (into require require-macros)

‎src/refactor_nrepl/find/util.clj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
(ns refactor-nrepl.find.util
2-
(:require [clojure.java.io :as io]
3-
[refactor-nrepl.core :as core]))
2+
(:require
3+
[clojure.java.io :as io]
4+
[refactor-nrepl.core :as core]))
45

56
(defn spurious?
67
"True if the occurrence doesn't exist at the given coordinates."

‎src/refactor_nrepl/middleware.clj

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
(ns refactor-nrepl.middleware
2-
(:require [cider.nrepl.middleware.util.cljs :as cljs]
3-
[clojure.stacktrace :refer [print-cause-trace]]
4-
[refactor-nrepl.config :as config]
5-
[refactor-nrepl.core :as core]
6-
[refactor-nrepl.ns.libspecs :refer [namespace-aliases]]
7-
[refactor-nrepl.stubs-for-interface :refer [stubs-for-interface]]
8-
[clojure.walk :as walk]))
2+
(:require
3+
[cider.nrepl.middleware.util.cljs :as cljs]
4+
[clojure.stacktrace :refer [print-cause-trace]]
5+
[clojure.walk :as walk]
6+
[refactor-nrepl.config :as config]
7+
[refactor-nrepl.core :as core]
8+
[refactor-nrepl.ns.libspecs :refer [namespace-aliases]]
9+
[refactor-nrepl.stubs-for-interface :refer [stubs-for-interface]]))
910

1011
;; Compatibility with the legacy tools.nrepl.
1112
;; It is not recommended to use the legacy tools.nrepl,

‎src/refactor_nrepl/ns/ns_parser.clj

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111
;; rest are cljs specific
1212
:refer-macros [referred macros here]
1313
:require-macros true}"
14-
(:require [clojure.java.io :as io]
15-
[clojure.set :as set]
16-
[refactor-nrepl.core :as core])
17-
(:import java.io.File))
14+
(:require
15+
[clojure.java.io :as io]
16+
[clojure.set :as set]
17+
[refactor-nrepl.core :as core])
18+
(:import
19+
(java.io File)))
1820

1921
(defn- libspec-vector->map
2022
[libspec]

‎src/refactor_nrepl/ns/pprint.clj

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
(ns refactor-nrepl.ns.pprint
2-
(:require [cljfmt.core :as fmt]
3-
[clojure
4-
[pprint]
5-
[string :as str]]
6-
[refactor-nrepl
7-
[config :refer [*config*]]
8-
[core :as core :refer [prefix-form?]]
9-
[util :as util :refer [replace-last]]])
10-
11-
(:import java.util.regex.Pattern))
2+
(:require
3+
[cljfmt.core :as fmt]
4+
[clojure.pprint]
5+
[clojure.string :as str]
6+
[refactor-nrepl.config :refer [*config*]]
7+
[refactor-nrepl.core :as core :refer [prefix-form?]]
8+
[refactor-nrepl.util :as util :refer [replace-last]])
9+
(:import
10+
(java.util.regex Pattern)))
1211

1312
(defn pprint
1413
"Pretty-prints `x` with custom, configurable overrides over `clojure.pprint`'s settings.

‎src/refactor_nrepl/ns/prune_dependencies.clj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
(ns refactor-nrepl.ns.prune-dependencies
2-
(:require [cider.nrepl.middleware.info :as info]
3-
[refactor-nrepl
4-
[core :as core]
5-
[util :as util]]
6-
[refactor-nrepl.find.symbols-in-file :as symbols-in-file]
7-
[refactor-nrepl.config :as config]))
2+
(:require
3+
[cider.nrepl.middleware.info :as info]
4+
[refactor-nrepl.config :as config]
5+
[refactor-nrepl.core :as core]
6+
[refactor-nrepl.find.symbols-in-file :as symbols-in-file]
7+
[refactor-nrepl.util :as util]))
88

99
(defn- lookup-symbol-ns
1010
([ns symbol]

‎src/refactor_nrepl/ns/resolve_missing.clj

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
(ns refactor-nrepl.ns.resolve-missing
22
"Resolve a missing symbol on the classpath."
3-
(:require [orchard.info :refer [info]]
4-
[cider.nrepl.middleware.util.cljs :as cljs]
5-
[orchard.cljs.analysis :as cljs-ana]
6-
[clojure.string :as str]
7-
[refactor-nrepl.core :refer [prefix suffix]]
8-
[refactor-nrepl.util :refer [self-referential?]]
9-
[refactor-nrepl.ns.imports-and-refers-analysis :as imports-and-refers-analysis]))
3+
(:require
4+
[cider.nrepl.middleware.util.cljs :as cljs]
5+
[clojure.string :as str]
6+
[orchard.cljs.analysis :as cljs-ana]
7+
[orchard.info :refer [info]]
8+
[refactor-nrepl.core :refer [prefix suffix]]
9+
[refactor-nrepl.ns.imports-and-refers-analysis :as imports-and-refers-analysis]
10+
[refactor-nrepl.util :refer [self-referential?]]))
1011

1112
(defn- candidates [sym]
1213
(reduce into

‎src/refactor_nrepl/ns/tracker.clj

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
(ns refactor-nrepl.ns.tracker
2-
(:require [clojure.java.io :as io]
3-
[clojure.string :as str]
4-
[clojure.tools.namespace
5-
[dependency :as dep]
6-
[file :as file]
7-
[repl :as tools.namespace.repl]
8-
[track :as tracker]]
9-
[refactor-nrepl.core :as core]
10-
[refactor-nrepl.util :as util]
11-
[refactor-nrepl.ns.ns-parser :as ns-parser])
12-
(:import [java.io File]))
2+
(:require
3+
[clojure.java.io :as io]
4+
[clojure.string :as str]
5+
[clojure.tools.namespace.dependency :as dep]
6+
[clojure.tools.namespace.file :as file]
7+
[clojure.tools.namespace.repl :as tools.namespace.repl]
8+
[clojure.tools.namespace.track :as tracker]
9+
[refactor-nrepl.core :as core]
10+
[refactor-nrepl.ns.ns-parser :as ns-parser]
11+
[refactor-nrepl.util :as util])
12+
(:import
13+
(java.io File)))
1314

1415
;; Exclude cljs files that use npm string requires until they fix this bug:
1516
;; https://clojure.atlassian.net/projects/TNS/issues/TNS-51

‎src/refactor_nrepl/rename_file_or_dir.clj

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
(ns refactor-nrepl.rename-file-or-dir
2-
(:require [clojure.string :as str]
3-
[me.raynes.fs :as fs]
4-
[refactor-nrepl
5-
[core :as core]
6-
[util :as util]]
7-
[refactor-nrepl.ns
8-
[ns-parser :as ns-parser]
9-
[pprint :refer [pprint-ns]]
10-
[rebuild :refer [rebuild-ns-form]]
11-
[tracker :as tracker]])
12-
(:import java.io.File
13-
java.nio.file.Files
14-
java.util.regex.Pattern))
2+
(:require
3+
[clojure.string :as str]
4+
[me.raynes.fs :as fs]
5+
[refactor-nrepl.core :as core]
6+
[refactor-nrepl.ns.ns-parser :as ns-parser]
7+
[refactor-nrepl.ns.pprint :refer [pprint-ns]]
8+
[refactor-nrepl.ns.rebuild :refer [rebuild-ns-form]]
9+
[refactor-nrepl.ns.tracker :as tracker]
10+
[refactor-nrepl.util :as util])
11+
(:import
12+
(java.io File)
13+
(java.nio.file Files)
14+
(java.util.regex Pattern)))
1515

1616
(declare -rename-file-or-dir)
1717

‎src/refactor_nrepl/stubs_for_interface.clj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
(ns refactor-nrepl.stubs-for-interface
2-
(:require [clojure
3-
[reflect :as reflect]
4-
[string :as str]]
5-
[refactor-nrepl.core :as core]))
2+
(:require
3+
[clojure.reflect :as reflect]
4+
[clojure.string :as str]
5+
[refactor-nrepl.core :as core]))
66

77
(defn- format-type-hint
88
[t]

0 commit comments

Comments
 (0)