Skip to content

Commit

Permalink
Merge branch 'clojure-emacs:master' into fix-remote-enrich-classpath-…
Browse files Browse the repository at this point in the history
…init
  • Loading branch information
caadr authored Jan 19, 2025
2 parents efe3b84 + 5f8b17c commit 7c4c2de
Show file tree
Hide file tree
Showing 95 changed files with 317 additions and 463 deletions.
62 changes: 0 additions & 62 deletions .github/stale.yml

This file was deleted.

36 changes: 36 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Close inactive issues and pull requests
on:
schedule:
- cron: "30 1 * * *"

jobs:
close-issues:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v9
with:
days-before-issue-stale: 30
days-before-issue-close: 30
stale-issue-label: "stale"
exempt-issue-labels: "high priority, good first issue, pinned"
stale-issue-message: >-
This issue has been automatically marked as stale because it has not
had any recent activity. It will be closed soon if no further
activity occurs. Thank you for your contribution and understanding!
close-issue-message: >-
This issue been automatically closed due to lack of activity. Feel free to re-open it
if you ever come back to it.
days-before-pr-stale: 30
days-before-pr-close: 30
exempt-pr-labels: "high priority, good first issue, pinned"
stale-pr-message: >-
This pull request has been automatically marked as stale because it has not
had any recent activity. It will be closed soon if no further
activity occurs. Thank you for your contribution and understanding!
close-pr-message: >-
This issue been automatically closed due to lack of activity. Feel free to re-open it
if you ever come back to it.
repo-token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
## master (unreleased)

### New features

- Automatic downloading of third-party Java sources for better Java documentation and jump-to-definition functionality. See [Obtaining source JARs](https://docs.cider.mx/cider/usage/working_with_documentation.html#obtaining-source-jars).
- CIDER [History](https://docs.cider.mx/cider/repl/history.html): Add a command to delete history item at point.

### Changes

- Bump the injected nREPL version to [1.3.1](https://github.com/nrepl/nrepl/blob/master/CHANGELOG.md#131-2025-01-01).
- Bump the injected `cider-nrepl` to [0.51.0](https://github.com/clojure-emacs/cider-nrepl/blob/master/CHANGELOG.md#0510-2025-01-01).
- Bump the injected `cider-nrepl` to [0.52.0](https://github.com/clojure-emacs/cider-nrepl/blob/master/CHANGELOG.md#0520-2025-01-10).
- [#3574](https://github.com/clojure-emacs/cider/issues/3574): New value `per-project` for `cider-repl-history-file` to save the history on a per-project basis.

### Bugs fixed
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ site. [[Become a sponsor](https://opencollective.com/cider#sponsor)]

CIDER is distributed under the GNU General Public License, version 3.

Copyright © 2012-2024 Bozhidar Batsov, Artur Malabarba, Tim King, Phil Hagelberg and
Copyright © 2012-2025 Bozhidar Batsov, Artur Malabarba, Tim King, Phil Hagelberg and
[contributors](https://github.com/clojure-emacs/cider/contributors).

[badge-license]: https://img.shields.io/badge/license-GPL_3-green.svg
Expand Down
2 changes: 1 addition & 1 deletion cider-apropos.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-apropos.el --- Apropos functionality for Clojure -*- lexical-binding: t -*-

;; Copyright © 2014-2024 Jeff Valk, Bozhidar Batsov and CIDER contributors
;; Copyright © 2014-2025 Jeff Valk, Bozhidar Batsov and CIDER contributors
;;
;; Author: Jeff Valk <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion cider-browse-ns.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-browse-ns.el --- CIDER namespace browser -*- lexical-binding: t; -*-

;; Copyright © 2014-2024 John Andrews, Bozhidar Batsov and CIDER contributors
;; Copyright © 2014-2025 John Andrews, Bozhidar Batsov and CIDER contributors

;; Author: John Andrews <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion cider-browse-spec.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-browse-spec.el --- CIDER spec browser -*- lexical-binding: t; -*-

;; Copyright © 2017-2024 Juan Monetta, Bozhidar Batsov and CIDER contributors
;; Copyright © 2017-2025 Juan Monetta, Bozhidar Batsov and CIDER contributors

;; Author: Juan Monetta <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion cider-cheatsheet.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-cheatsheet.el --- Quick reference for Clojure -*- lexical-binding: t -*-

;; Copyright © 2019-2024 Kris Jenkins, Bozhidar Batsov and CIDER contributors
;; Copyright © 2019-2025 Kris Jenkins, Bozhidar Batsov and CIDER contributors
;;
;; Author: Kris Jenkins <[email protected]>
;; Kato Muso <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion cider-classpath.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-classpath.el --- Basic Java classpath browser -*- lexical-binding: t; -*-

;; Copyright © 2014-2024 Bozhidar Batsov and CIDER contributors
;; Copyright © 2014-2025 Bozhidar Batsov and CIDER contributors

;; This program is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
Expand Down
49 changes: 38 additions & 11 deletions cider-client.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-client.el --- A layer of abstraction above low-level nREPL client code. -*- lexical-binding: t -*-

;; Copyright © 2013-2024 Bozhidar Batsov
;; Copyright © 2013-2025 Bozhidar Batsov
;;
;; Author: Bozhidar Batsov <[email protected]>

Expand Down Expand Up @@ -189,16 +189,20 @@ the current connection. Return the id of the sent message.
If TOOLING is truthy then the tooling session is used."
(nrepl-send-request request callback (or connection (cider-current-repl 'any 'ensure)) tooling))

(defun cider-nrepl-send-sync-request (request &optional connection abort-on-input)
(defun cider-nrepl-send-sync-request (request &optional connection
abort-on-input callback)
"Send REQUEST to the nREPL server synchronously using CONNECTION.
Hold till final \"done\" message has arrived and join all response messages
of the same \"op\" that came along and return the accumulated response.
If ABORT-ON-INPUT is non-nil, the function will return nil
at the first sign of user input, so as not to hang the
interface."
interface.
if CALLBACK is non-nil, it will additionally be called on all received messages."
(nrepl-send-sync-request request
(or connection (cider-current-repl 'any 'ensure))
abort-on-input))
abort-on-input
nil
callback))

(defun cider-nrepl-send-unhandled-request (request &optional connection)
"Send REQUEST to the nREPL CONNECTION and ignore any responses.
Expand Down Expand Up @@ -342,6 +346,17 @@ The default value in nREPL is 1024."
:group 'cider
:package-version '(cider . "0.25.0"))

(defcustom cider-download-java-sources nil
"Whether to automatically download source artifacts for 3rd-party Java classes.
When enabled, CIDER will attempt to download source JARs from Maven for
Java classes if the source file is not found locally. This downloading only
happens once per artifact, and only when the user jumps to definition or
requests `cider-doc' on a Java class or a member of the class."
:type 'boolean
:group 'cider
:package-version '(cider . "1.17.0"))

(defun cider--print-fn ()
"Return the value to send in the nrepl.middleware.print/print slot."
(pcase cider-print-fn
Expand Down Expand Up @@ -681,13 +696,25 @@ CONTEXT represents a completion context for compliment."

(defun cider-sync-request:info (symbol &optional class member context)
"Send \"info\" op with parameters SYMBOL or CLASS and MEMBER, honor CONTEXT."
(let ((var-info (thread-first `("op" "info"
"ns" ,(cider-current-ns)
,@(when symbol `("sym" ,symbol))
,@(when class `("class" ,class))
,@(when member `("member" ,member))
,@(when context `("context" ,context)))
(cider-nrepl-send-sync-request (cider-current-repl)))))
(let* ((req
`("op" "info"
"ns" ,(cider-current-ns)
,@(when symbol `("sym" ,symbol))
,@(when class `("class" ,class))
,@(when member `("member" ,member))
,@(when context `("context" ,context))
,@(when cider-download-java-sources `("download-sources-jar" "1"))))
(callback
(lambda (resp)
(let ((status (nrepl-dict-get resp "status"))
(coords (nrepl-dict-get resp "coords")))
(when (member "download-sources-jar" status)
(message "Local source not found, downloading Java sources for artifact %s/%s %s..."
(nrepl-dict-get coords "group")
(nrepl-dict-get coords "artifact")
(nrepl-dict-get coords "version"))))))
(var-info
(cider-nrepl-send-sync-request req (cider-current-repl) nil callback)))
(if (member "no-info" (nrepl-dict-get var-info "status"))
nil
var-info)))
Expand Down
2 changes: 1 addition & 1 deletion cider-clojuredocs.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-clojuredocs.el --- ClojureDocs integration -*- lexical-binding: t -*-

;; Copyright © 2014-2024 Bozhidar Batsov and CIDER contributors
;; Copyright © 2014-2025 Bozhidar Batsov and CIDER contributors
;;
;; Author: Bozhidar Batsov <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion cider-common.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-common.el --- Common use functions -*- lexical-binding: t; -*-

;; Copyright © 2015-2024 Artur Malabarba
;; Copyright © 2015-2025 Artur Malabarba

;; Author: Artur Malabarba <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion cider-completion-context.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-completion-context.el --- Context parsing -*- lexical-binding: t -*-

;; Copyright © 2013-2024 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;; Copyright © 2013-2025 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Bozhidar Batsov <[email protected]>
;; Artur Malabarba <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion cider-completion.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-completion.el --- Smart REPL-powered code completion -*- lexical-binding: t -*-

;; Copyright © 2013-2024 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;; Copyright © 2013-2025 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Bozhidar Batsov <[email protected]>
;; Artur Malabarba <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion cider-connection.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-connection.el --- Connection and session life-cycle management for CIDER -*- lexical-binding: t -*-
;;
;; Copyright © 2019-2024 Artur Malabarba, Bozhidar Batsov, Vitalie Spinu and CIDER contributors
;; Copyright © 2019-2025 Artur Malabarba, Bozhidar Batsov, Vitalie Spinu and CIDER contributors
;;
;; Author: Artur Malabarba <[email protected]>
;; Bozhidar Batsov <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion cider-debug.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-debug.el --- CIDER interaction with the cider.debug nREPL middleware -*- lexical-binding: t; -*-

;; Copyright © 2015-2024 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;; Copyright © 2015-2025 Bozhidar Batsov, Artur Malabarba and CIDER contributors

;; Author: Artur Malabarba <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion cider-doc.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-doc.el --- CIDER documentation functionality -*- lexical-binding: t -*-

;; Copyright © 2014-2024 Bozhidar Batsov, Jeff Valk and CIDER contributors
;; Copyright © 2014-2025 Bozhidar Batsov, Jeff Valk and CIDER contributors

;; Author: Jeff Valk <[email protected]>

Expand Down
5 changes: 3 additions & 2 deletions cider-docstring.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-docstring.el --- Docstring rendering -*- lexical-binding: t -*-

;; Copyright © 2013-2024 Bozhidar Batsov and CIDER contributors
;; Copyright © 2013-2025 Bozhidar Batsov and CIDER contributors
;;
;; Author: Bozhidar Batsov <[email protected]>

Expand Down Expand Up @@ -157,7 +157,8 @@ that it usually has two spaces before each line used for indentation
\(see https://guide.clojure.style/#docstring-indentation). While displaying
the docstring to the user, we usually want to control indentation and
other aspects of the presentation, so we format it before displaying."
(replace-regexp-in-string "\n " "\n" string))
(when string
(replace-regexp-in-string "\n " "\n" string)))

(provide 'cider-docstring)
;;; cider-docstring.el ends here
4 changes: 2 additions & 2 deletions cider-eldoc.el
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;;; cider-eldoc.el --- eldoc support for Clojure -*- lexical-binding: t -*-

;; Copyright © 2012-2024 Tim King, Phil Hagelberg, Bozhidar Batsov
;; Copyright © 2013-2024 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;; Copyright © 2012-2025 Tim King, Phil Hagelberg, Bozhidar Batsov
;; Copyright © 2013-2025 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <[email protected]>
;; Phil Hagelberg <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions cider-eval.el
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;;; cider-eval.el --- Interactive evaluation (compilation) functionality -*- lexical-binding: t -*-

;; Copyright © 2012-2024 Tim King, Phil Hagelberg, Bozhidar Batsov
;; Copyright © 2013-2024 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;; Copyright © 2012-2025 Tim King, Phil Hagelberg, Bozhidar Batsov
;; Copyright © 2013-2025 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <[email protected]>
;; Phil Hagelberg <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion cider-find.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-find.el --- Functionality for finding things -*- lexical-binding: t -*-

;; Copyright © 2013-2024 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;; Copyright © 2013-2025 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Bozhidar Batsov <[email protected]>
;; Artur Malabarba <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion cider-format.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-format.el --- Code and EDN formatting functionality -*- lexical-binding: t -*-

;; Copyright © 2013-2024 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;; Copyright © 2013-2025 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Bozhidar Batsov <[email protected]>
;; Artur Malabarba <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions cider-inspector.el
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;;; cider-inspector.el --- Object inspector -*- lexical-binding: t -*-

;; Copyright © 2013-2024 Vital Reactor, LLC
;; Copyright © 2014-2024 Bozhidar Batsov and CIDER contributors
;; Copyright © 2013-2025 Vital Reactor, LLC
;; Copyright © 2014-2025 Bozhidar Batsov and CIDER contributors

;; Author: Ian Eslick <[email protected]>
;; Bozhidar Batsov <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion cider-jar.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-jar.el --- Jar functionality for Clojure -*- lexical-binding: t -*-

;; Copyright © 2022-2024 Arne Brasseur
;; Copyright © 2022-2025 Arne Brasseur
;;
;; Author: Arne Brasseur <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion cider-log.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; cider-log.el --- Log inspection functionality for Clojure -*- lexical-binding: t -*-

;; Copyright © 2023-2024 Bozhidar Batsov and CIDER contributors
;; Copyright © 2023-2025 Bozhidar Batsov and CIDER contributors

;; Author: r0man <[email protected]>

Expand Down
4 changes: 2 additions & 2 deletions cider-macroexpansion.el
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;;; cider-macroexpansion.el --- Macro expansion support -*- lexical-binding: t -*-

;; Copyright © 2012-2024 Tim King, Phil Hagelberg, Bozhidar Batsov
;; Copyright © 2013-2024 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;; Copyright © 2012-2025 Tim King, Phil Hagelberg, Bozhidar Batsov
;; Copyright © 2013-2025 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <[email protected]>
;; Phil Hagelberg <[email protected]>
Expand Down
Loading

0 comments on commit 7c4c2de

Please sign in to comment.