Merge pull request #15 from liquidz/dev

1.2.0

.clj-kondo/config.edn

@@ -1,5 +1,4 @@
-{
- :linters {:unresolved-symbol
+{:linters {:unresolved-symbol
            {:exclude [(clojure.test/is [compatible])
                       set-descriptor!]}
 
@@ -15,5 +14,4 @@
            {:level :error}}
 
  :output {:exclude-files
-          ["src/iced/nrepl/transport.clj"]}
- }
+          ["src/iced/nrepl/transport.clj"]}}

.cljstyle

@@ -1,6 +1,4 @@
-{
- :list-indent-size 1
- :insert-padding-lines? false
- :file-ignore #{"target"}
- }
-; vim:ft=clojure
+{:rules {:indentation {:list-indent 1}
+         :blank-lines {:insert-padding? false}
+         :namespaces {:indent-size 1}}
+ :files {:ignore #{"target"}}}

.github/workflows/dependencies.yml

@@ -10,4 +10,4 @@ jobs:
       - uses: actions/checkout@v2
       - uses: liquidz/antq-action@v1
         with:
-          excludes: 'nrepl/nrepl cljfmt/cljfmt'
+          excludes: 'cider/orchard'

.github/workflows/lint.yml

@@ -5,15 +5,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      # c.f. https://github.com/borkdude/clj-kondo/blob/master/doc/ci-integration.md#linter-output-integration
-      - name: Lint by clj-kondo
-        run: docker run --rm -v $(pwd):/tmp/work -w /tmp/work borkdude/clj-kondo clj-kondo --lint src:test --config '{:output {:pattern "::{{level}} file={{filename}},line={{row}},col={{col}}::{{message}}"}}'
+      - uses: DeLaGuardo/setup-clj-kondo@master
+        with:
+          version: '2021.02.13'
+      - run: clj-kondo --lint src:test --config '{:output {:pattern "::{{level}} file={{filename}},line={{row}},col={{col}}::{{message}}"}}'
 
   cljstyle:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: |
-          curl -sfLo cljstyle.tar.gz https://github.com/greglook/cljstyle/releases/download/0.12.1/cljstyle_0.12.1_linux.tar.gz
-          tar xvf cljstyle.tar.gz
-          ./cljstyle check
+      - uses: 0918nobita/setup-cljstyle@v0.2.0
+        with:
+          cljstyle-version: 0.14.0
+      - run: cljstyle check --report -v

.gitignore

@@ -16,3 +16,4 @@ pom.xml.asc
 .patch
 .eastwood
 /.clj-kondo/.cache
+**/.lsp

Makefile

@@ -1,6 +1,6 @@
 .PHONY: deps repl coverage test dev-test install dev-install release deploy outdated clean
 
-VERSION := 1.10.1
+VERSION := 1.10.2
 
 .inline-deps:
 	lein inline-deps
@@ -36,7 +36,7 @@ deploy: .inline-deps
 	lein with-profile +release,+plugin.mranderson/config deploy clojars
 
 outdated:
-	lein with-profile +antq run -m antq.core --exclude cljfmt/cljfmt --upgrade
+	lein with-profile +antq run -m antq.core --exclude cider/orchard --upgrade
 
 clean:
 	lein clean

README.adoc

@@ -33,6 +33,12 @@ image:https://img.shields.io/clojars/v/iced-nrepl.svg["Clojars Project", link="h
 | `:path`
 |
 
+| iced-java-class-candidates
+| `:symbol`
+| `:class-map`
+| `:candidates`
+|
+
 | iced-set-indentation-rules
 | `:rules`
 | `:overwrite?`

project.clj

@@ -1,4 +1,4 @@
-(defproject iced-nrepl "1.1.3-SNAPSHOT"
+(defproject iced-nrepl "1.2.0-SNAPSHOT"
   :description "nREPL middleware for vim-iced"
   :url "https://github.com/liquidz/iced-nrepl"
   :license {:name "Eclipse Public License"
@@ -11,26 +11,25 @@
                  ^:inline-dep [org.clojure/tools.namespace "1.1.0" ; required by cljfmt
                                :exclusions [org.clojure/java.classpath]]
                  ^:inline-dep [cider/orchard "0.6.2"]
-                 ;; TODO cljfmt 0.7.0 seems to be failed
-                 ^:inline-dep [cljfmt "0.6.8"
+                 ^:inline-dep [cljfmt "0.7.0"
                                :exclusions [org.clojure/clojure
                                             org.clojure/clojurescript
                                             org.clojure/tools.reader]]
                  ^:inline-dep [medley "1.3.0"
                                :exclusions [org.clojure/clojure]]]
 
-  :plugins [[thomasa/mranderson "0.5.2"]
-            [lein-cloverage "1.2.1"]]
+  :plugins [[thomasa/mranderson "0.5.3"]
+            [lein-cloverage "1.2.2"]]
   :mranderson {:project-prefix "mrandersonicednrepl"}
 
   :profiles
   {:dev {:source-paths ["src" "test_files"]
          :global-vars {*warn-on-reflection* true}}
    :1.9 [:dev {:dependencies [[org.clojure/clojure "1.9.0"]]}]
    :1.10 [:dev {:dependencies [[org.clojure/clojure "1.10.0"]]}]
-   :1.10.1 [:dev {:dependencies [[org.clojure/clojure "1.10.1"]]}]
+   :1.10.2 [:dev {:dependencies [[org.clojure/clojure "1.10.2"]]}]
 
-   :release {:dependencies [[org.clojure/clojure "1.10.1"]]}
+   :release {:dependencies [[org.clojure/clojure "1.10.2"]]}
    :antq {:dependencies [[antq "RELEASE"]]}}
 
   :release-tasks [["vcs" "assert-committed"]
@@ -41,4 +40,4 @@
                   ["vcs" "commit"]
                   ["vcs" "push"]]
 
-  :aliases {"test-all" ["do" ["with-profile" "1.9:1.10:1.10.1" "test"]]})
+  :aliases {"test-all" ["do" ["with-profile" "1.9:1.10:1.10.2" "test"]]})

resources/java_classes.edn

@@ -0,0 +1,169 @@
+{:java.util #{AbstractCollection
+              AbstractList
+              AbstractMap
+              AbstractQueue
+              AbstractSequentialList
+              AbstractSet
+              ArrayDeque
+              ArrayList
+              Arrays
+              Base64
+              BitSet
+              Calendar
+              Collections
+              ConcurrentModificationException
+              Currency
+              Date
+              Dictionary
+              DoubleSummaryStatistics
+              DuplicateFormatFlagsException
+              EmptyStackException
+              EnumMap
+              EnumSet
+              EventListenerProxy
+              EventObject
+              FormatFlagsConversionMismatchException
+              FormattableFlags
+              Formatter
+              FormatterClosedException
+              GregorianCalendar
+              HashMap
+              HashSet
+              Hashtable
+              IdentityHashMap
+              IllegalFormatCodePointException
+              IllegalFormatConversionException
+              IllegalFormatException
+              IllegalFormatFlagsException
+              IllegalFormatPrecisionException
+              IllegalFormatWidthException
+              IllformedLocaleException
+              InputMismatchException
+              IntSummaryStatistics
+              InvalidPropertiesFormatException
+              LinkedHashMap
+              LinkedHashSet
+              LinkedList
+              ListResourceBundle
+              Locale
+              LongSummaryStatistics
+              MissingFormatArgumentException
+              MissingFormatWidthException
+              MissingResourceException
+              NoSuchElementException
+              Objects
+              Optional
+              OptionalDouble
+              OptionalInt
+              OptionalLong
+              PriorityQueue
+              Properties
+              PropertyPermission
+              PropertyResourceBundle
+              Random
+              ResourceBundle
+              Scanner
+              ServiceConfigurationError
+              ServiceLoader
+              SimpleTimeZone
+              Spliterators
+              SplittableRandom
+              Stack
+              StringJoiner
+              StringTokenizer
+              TimeZone
+              Timer
+              TimerTask
+              TooManyListenersException
+              TreeMap
+              TreeSet
+              UUID
+              UnknownFormatConversionException
+              UnknownFormatFlagsException
+              Vector
+              WeakHashMap}
+
+ :clojure.lang #{AFn
+                 AFunction
+                 AMapEntry
+                 APersistentMap
+                 APersistentSet
+                 APersistentVector
+                 ARef
+                 AReference
+                 ASeq
+                 ATransientMap
+                 ATransientSet
+                 Agent
+                 ArityException
+                 ArrayChunk
+                 ArrayIter
+                 ArraySeq
+                 Atom
+                 BigInt
+                 Binding
+                 Box
+                 ChunkBuffer
+                 ChunkedCons
+                 Compile
+                 Compiler
+                 Cons
+                 Cycle
+                 Delay
+                 DynamicClassLoader
+                 EdnReader
+                 EnumerationSeq
+                 ExceptionInfo
+                 FnLoaderThunk
+                 Intrinsics
+                 Iterate
+                 IteratorSeq
+                 Keyword
+                 KeywordLookupSite
+                 LazilyPersistentVector
+                 LazySeq
+                 LineNumberingPushbackReader
+                 LispReader
+                 LockingTransaction
+                 LongRange
+                 MapEntry
+                 MethodImplCache
+                 MultiFn
+                 Murmur3
+                 Namespace
+                 Numbers
+                 Obj
+                 PersistentArrayMap
+                 PersistentHashMap
+                 PersistentHashSet
+                 PersistentList
+                 PersistentQueue
+                 PersistentStructMap
+                 PersistentTreeMap
+                 PersistentTreeSet
+                 PersistentVector
+                 ProxyHandler
+                 RT
+                 Range
+                 Ratio
+                 ReaderConditional
+                 RecordIterator
+                 Reduced
+                 Ref
+                 Reflector
+                 Repeat
+                 Repl
+                 RestFn
+                 Script
+                 SeqEnumeration
+                 SeqIterator
+                 StringSeq
+                 Symbol
+                 TaggedLiteral
+                 TransactionalHashMap
+                 TransformerIterator
+                 Tuple
+                 Util
+                 Var
+                 Volatile
+                 XMLHandler}}

src/iced/nrepl.clj

@@ -34,6 +34,7 @@
          format/iced-calculate-indent-level
          format/iced-format-code-with-indents
          format/iced-set-indentation-rules
+         namespace/iced-java-class-candidates
          namespace/iced-project-ns-list
          namespace/iced-pseudo-ns-path
          refactor.thread/iced-refactor-thread-first

src/iced/nrepl/format.clj

@@ -84,9 +84,9 @@
                    "alias-map" "Namespace alias map."}
         :optional {}
         :returns {"formatted" "Formatted code."
-                  "error" "Error message if occured."
-                  "line" "Error line number if occured."
-                  "column" "Error column number if occured."
+                  "error" "Error message if occurred"
+                  "line" "Error line number if occurred"
+                  "column" "Error column number if occurred"
                   "status" "done"}}
   iced-format-code-with-indents
   [msg]
@@ -99,9 +99,9 @@
                    "alias-map" "Namespace alias map."}
         :optional {}
         :returns {"indent-level" "Calculated indentation level."
-                  "error" "Error message if occured."
-                  "line" "Error line number if occured."
-                  "column" "Error column number if occured."
+                  "error" "Error message if occurred"
+                  "line" "Error line number if occurred"
+                  "column" "Error column number if occurred"
                   "status" "done"}}
   iced-calculate-indent-level
   [msg]