branch: externals/phpinspect
commit ad4b1f25a6a887df42a26d1ff1c13d3359871000
Author: Hugo Thunnissen <de...@hugot.nl>
Commit: Hugo Thunnissen <de...@hugot.nl>
Update copyright statements and apply some code style improvements
As suggested by Stefan Monniers patch:
- https://mail.gnu.org/archive/html/emacs-devel/2023-08/msg00367.html
---
phpinspect-autoload.el | 2 +-
phpinspect-bmap.el | 2 +-
phpinspect-buffer.el | 2 +-
phpinspect-cache.el | 6 +-----
phpinspect-changeset.el | 2 +-
phpinspect-class-struct.el | 2 +-
phpinspect-class.el | 2 +-
phpinspect-completion.el | 6 +++---
phpinspect-edtrack.el | 2 +-
phpinspect-eldoc.el | 6 +++---
phpinspect-fs.el | 2 +-
phpinspect-imports.el | 2 +-
phpinspect-index.el | 2 +-
phpinspect-meta.el | 2 +-
phpinspect-parse-context.el | 6 +++---
phpinspect-parser.el | 9 +++------
phpinspect-pipeline.el | 8 +++-----
phpinspect-project-struct.el | 2 +-
phpinspect-project.el | 4 ++--
phpinspect-queue.el | 2 +-
phpinspect-resolve.el | 2 +-
phpinspect-resolvecontext.el | 2 +-
phpinspect-serialize.el | 2 +-
phpinspect-splayt.el | 2 +-
phpinspect-suggest.el | 2 +-
phpinspect-toc.el | 2 +-
phpinspect-token-predicates.el | 2 +-
phpinspect-type.el | 8 +++-----
phpinspect-util.el | 2 +-
phpinspect-worker.el | 4 ++--
phpinspect.el | 10 +++++-----
test/phpinspect-test.el | 2 +-
test/test-autoload.el | 2 +-
test/test-buffer.el | 2 +-
test/test-class.el | 2 +-
test/test-fs.el | 2 +-
test/test-index.el | 2 +-
test/test-meta.el | 2 +-
test/test-parse-context.el | 2 +-
test/test-parser.el | 2 +-
test/test-pipeline.el | 2 +-
test/test-project.el | 2 +-
test/test-splayt.el | 2 +-
test/test-type.el | 2 +-
test/test-util.el | 2 +-
test/test-worker.el | 2 +-
46 files changed, 64 insertions(+), 75 deletions(-)
diff --git a/phpinspect-autoload.el b/phpinspect-autoload.el
index 995ec2f903..f22e504a0e 100644
--- a/phpinspect-autoload.el
+++ b/phpinspect-autoload.el
@@ -1,6 +1,6 @@
;;; phpinspect-autoload.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-bmap.el b/phpinspect-bmap.el
index d38dd9b513..8628d5b0d5 100644
--- a/phpinspect-bmap.el
+++ b/phpinspect-bmap.el
@@ -1,6 +1,6 @@
;;; phpinspect-bmap.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-buffer.el b/phpinspect-buffer.el
index fee8228adc..972b5236ef 100644
--- a/phpinspect-buffer.el
+++ b/phpinspect-buffer.el
@@ -1,6 +1,6 @@
;;; phpinspect-buffer.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-cache.el b/phpinspect-cache.el
index 9bc2e8ca21..cc842bf18d 100644
--- a/phpinspect-cache.el
+++ b/phpinspect-cache.el
@@ -1,6 +1,6 @@
;;; phpinspect.el --- PHP parsing and completion package -*- lexical-binding:
t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
@@ -57,10 +57,6 @@ currently opened projects."
;; Assign a fresh cache object
(setq phpinspect-cache (phpinspect--make-cache)))
-(cl-defgeneric phpinspect--cache-getproject
- ((cache phpinspect--cache) (project-name string))
- "Get project by PROJECT-NAME that is located in CACHE.")
-
(cl-defmethod phpinspect--cache-getproject
((cache phpinspect--cache) (project-root string))
(gethash project-root (phpinspect--cache-projects cache)))
diff --git a/phpinspect-changeset.el b/phpinspect-changeset.el
index 406a9ba359..c70bfd3407 100644
--- a/phpinspect-changeset.el
+++ b/phpinspect-changeset.el
@@ -1,6 +1,6 @@
;;; phpinspect-changeset.el --- Metadata changeset module -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-class-struct.el b/phpinspect-class-struct.el
index 9b91aaa0c2..bbfa1236a6 100644
--- a/phpinspect-class-struct.el
+++ b/phpinspect-class-struct.el
@@ -1,6 +1,6 @@
;;; phpinspect-class-struct.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-class.el b/phpinspect-class.el
index d40a90282b..1144825537 100644
--- a/phpinspect-class.el
+++ b/phpinspect-class.el
@@ -1,6 +1,6 @@
;;; phpinspect-class.el --- PHP parsing module -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-completion.el b/phpinspect-completion.el
index 92e75ba857..469275021d 100644
--- a/phpinspect-completion.el
+++ b/phpinspect-completion.el
@@ -1,6 +1,6 @@
;;; phpinspect-type.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
@@ -97,11 +97,11 @@ candidate. Candidates can be indexed functions and
variables.")
:type phpinspect-buffer))
-(cl-defgeneric phpinspect-comp-strategy-supports (strategy (query
phpinspect-completion-query) (context phpinspect--resolvecontext))
+(cl-defgeneric phpinspect-comp-strategy-supports (strategy query context)
"Should return non-nil if STRATEGY should be deployed for QUERY
and CONTEXT. All strategies must implement this method.")
-(cl-defgeneric phpinspect-comp-strategy-execute (strategy (query
phpinspect-completion-query) (context phpinspect--resolvecontext))
+(cl-defgeneric phpinspect-comp-strategy-execute (strategy query context)
"Should return a list of objects for which
`phpinspect--make-completion' is implemented.")
diff --git a/phpinspect-edtrack.el b/phpinspect-edtrack.el
index 45baa3acb7..9224af6359 100644
--- a/phpinspect-edtrack.el
+++ b/phpinspect-edtrack.el
@@ -1,6 +1,6 @@
;;; phpinspect-edtrack.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-eldoc.el b/phpinspect-eldoc.el
index 0de18be472..4c24d87407 100644
--- a/phpinspect-eldoc.el
+++ b/phpinspect-eldoc.el
@@ -1,6 +1,6 @@
;;; phpinspect-eldoc.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
@@ -39,11 +39,11 @@
:type phpinspect-buffer))
-(cl-defgeneric phpinspect-eld-strategy-supports (strategy (query
phpinspect-eldoc-query) (context phpinspect--resolvecontext))
+(cl-defgeneric phpinspect-eld-strategy-supports (strategy query context)
"Should return non-nil if STRATEGY should be deployed for QUERY
and CONTEXT. All strategies must implement this method.")
-(cl-defgeneric phpinspect-eld-strategy-execute (strategy (query
phpinspect-eldoc-query) (context phpinspect--resolvecontext))
+(cl-defgeneric phpinspect-eld-strategy-execute (strategy query context)
"Should return an object for which `phpinspect-eldoc-string' is
implemented.")
(cl-defgeneric phpinspect-eldoc-string (response)
diff --git a/phpinspect-fs.el b/phpinspect-fs.el
index ab293ef9a9..cd55d9e639 100644
--- a/phpinspect-fs.el
+++ b/phpinspect-fs.el
@@ -1,6 +1,6 @@
;;; phpinspect-fs.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-imports.el b/phpinspect-imports.el
index fb42af3ffc..848c548c64 100644
--- a/phpinspect-imports.el
+++ b/phpinspect-imports.el
@@ -1,6 +1,6 @@
; phpinspect-imports.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-index.el b/phpinspect-index.el
index a4b7c919bd..7f442fa622 100644
--- a/phpinspect-index.el
+++ b/phpinspect-index.el
@@ -1,6 +1,6 @@
;;; phpinspect-index.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-meta.el b/phpinspect-meta.el
index a66e5510b2..3e116305ae 100644
--- a/phpinspect-meta.el
+++ b/phpinspect-meta.el
@@ -1,6 +1,6 @@
;;; phpinspect-meta.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-parse-context.el b/phpinspect-parse-context.el
index a42add3402..f5c6401e1f 100644
--- a/phpinspect-parse-context.el
+++ b/phpinspect-parse-context.el
@@ -1,6 +1,6 @@
;;; phpinspect-parse-context.el --- PHP parsing context module -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
@@ -36,7 +36,7 @@ parsing. Usually used in combination with
"Parser Context"
(incremental nil)
(meta-iterator nil)
- (interrupt-threshold (time-convert '(2 . 1000))
+ (interrupt-threshold (time-convert '(0 0 2000 0))
:documentation
"After how much time `interrupt-predicate'
should be polled. This is 2ms by default.")
@@ -110,7 +110,7 @@ thrown.")
(inline-quote
(progn
(unless (phpinspect-pctx--start-time ,pctx)
- (setf (phpinspect-pctx--start-time ,pctx) (time-convert nil)))
+ (setf (phpinspect-pctx--start-time ,pctx) (time-convert nil t)))
;; Interrupt when blocking too long while input is pending.
(when (and (time-less-p (phpinspect-pctx-interrupt-threshold ,pctx)
diff --git a/phpinspect-parser.el b/phpinspect-parser.el
index 59b9aa3220..ccef0e2f04 100644
--- a/phpinspect-parser.el
+++ b/phpinspect-parser.el
@@ -1,6 +1,6 @@
;;; phpinspect-parser.el --- PHP parsing module -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
@@ -348,15 +348,12 @@ parsing incrementally."
`(eval-when-compile
(let ((parser (phpinspect-make-parser ,@parameters)))
- (defconst ,simple-name nil)
- (defconst ,incremental-name nil)
+ (defconst ,simple-name parser)
+ (defconst ,incremental-name parser)
(put (quote ,simple-name) 'phpinspect--parser t)
(put (quote ,incremental-name) 'phpinspect--incremental-parser t)
- (setf ,simple-name parser)
- (setf ,incremental-name parser)
-
;; Stub function to please the byte compiler (real function will be
;; defined by `phpinspect-define-parser-functions'.
(defun ,func-name (_buffer _max-point &optional _skip-over
_continue-condition _root))))))
diff --git a/phpinspect-pipeline.el b/phpinspect-pipeline.el
index d13c66725f..c684dc9ba5 100644
--- a/phpinspect-pipeline.el
+++ b/phpinspect-pipeline.el
@@ -1,6 +1,6 @@
;;; phpinspect-pipeline.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
@@ -273,11 +273,9 @@ directories."
(while parameters
(setq key (pop parameters)
value (pop parameters))
- (when (eq :with-context key)
- (setq value `(quote ,value)))
(setq key (intern (string-replace ":with-" ":" (symbol-name
key))))
(setq construct-params (nconc construct-params (list key
value)))))
- (push (eval `(phpinspect--make-pipeline-step ,@construct-params
:name (quote ,name)))
+ (push (apply #'phpinspect--make-pipeline-step `(,@construct-params
:name ,name))
steps)))
(_ (error "unexpected key %s" key))))
@@ -320,7 +318,7 @@ directories."
,queue-sym (phpinspect-make-pipeline-end :thread (current-thread)))
(while ,collecting-sym
- (ignore-error 'phpinspect-pipeline-incoming
+ (ignore-error phpinspect-pipeline-incoming
(progn
(phpinspect-pipeline--register-wakeup-function ,end-queue-sym)
(while (not (phpinspect-pipeline-end-p
diff --git a/phpinspect-project-struct.el b/phpinspect-project-struct.el
index 8baf6ff29f..94c51627ac 100644
--- a/phpinspect-project-struct.el
+++ b/phpinspect-project-struct.el
@@ -1,6 +1,6 @@
;;; phpinspect-project-struct.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-project.el b/phpinspect-project.el
index dded436c0c..0d103ebb21 100644
--- a/phpinspect-project.el
+++ b/phpinspect-project.el
@@ -1,6 +1,6 @@
;;; phpinspect-project.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
@@ -278,7 +278,7 @@ before the search is executed."
:documentation
"The type whose file should be indexed."))
-(cl-defgeneric phpinspect-make-index-task ((project phpinspect-project)
+(cl-defmethod phpinspect-make-index-task ((project phpinspect-project)
(type phpinspect--type))
(phpinspect-make-index-task-generated
:project project
diff --git a/phpinspect-queue.el b/phpinspect-queue.el
index c64b7d5dfb..11f584fb51 100644
--- a/phpinspect-queue.el
+++ b/phpinspect-queue.el
@@ -1,6 +1,6 @@
;;; phpinspect-queue.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-resolve.el b/phpinspect-resolve.el
index 2c722c77ae..1aba206d5d 100644
--- a/phpinspect-resolve.el
+++ b/phpinspect-resolve.el
@@ -1,6 +1,6 @@
;;; phpinspect-resolve.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-resolvecontext.el b/phpinspect-resolvecontext.el
index 557069eba4..4290aba693 100644
--- a/phpinspect-resolvecontext.el
+++ b/phpinspect-resolvecontext.el
@@ -1,6 +1,6 @@
;;; phpinspect-resolvecontext.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-serialize.el b/phpinspect-serialize.el
index dc72762cea..14bc58c0f5 100644
--- a/phpinspect-serialize.el
+++ b/phpinspect-serialize.el
@@ -1,6 +1,6 @@
;;; phpinspect-index.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-splayt.el b/phpinspect-splayt.el
index 4bba8744db..339bf3739a 100644
--- a/phpinspect-splayt.el
+++ b/phpinspect-splayt.el
@@ -1,6 +1,6 @@
;;; phpinspect-splayt.el --- A Splay Tree Implementation -*- lexical-binding:
t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-suggest.el b/phpinspect-suggest.el
index d94b8854e8..fa4e401353 100644
--- a/phpinspect-suggest.el
+++ b/phpinspect-suggest.el
@@ -1,6 +1,6 @@
;;; phpinspect-suggest.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-toc.el b/phpinspect-toc.el
index b8f7d4e89a..cf43a335c6 100644
--- a/phpinspect-toc.el
+++ b/phpinspect-toc.el
@@ -1,6 +1,6 @@
;;; phpinspect-toc.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-token-predicates.el b/phpinspect-token-predicates.el
index 9ae912dc3e..27dce56988 100644
--- a/phpinspect-token-predicates.el
+++ b/phpinspect-token-predicates.el
@@ -1,6 +1,6 @@
;;; phpinspect-token-predicates.el --- Predicates for phpinspect-parser tokens
types -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-type.el b/phpinspect-type.el
index abb2e44a54..e113b85a19 100644
--- a/phpinspect-type.el
+++ b/phpinspect-type.el
@@ -1,6 +1,6 @@
;;; phpinspect-type.el --- Data structures that represent phpinspect types
-*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
@@ -244,10 +244,8 @@ return type of the function."))
(cl-defmethod phpinspect--function-set-name ((func phpinspect--function) (name
string))
(setf (phpinspect--function-name-symbol func) (intern name
phpinspect-name-obarray)))
-(cl-defgeneric phpinspect--function-name ((func phpinspect--function)))
-
-(cl-defmethod phpinspect--function-name ((func phpinspect--function))
- (symbol-name (phpinspect--function-name-symbol func)))
+(define-inline phpinspect--function-name (func)
+ (inline-quote (symbol-name (phpinspect--function-name-symbol ,func))))
(cl-defstruct (phpinspect--variable (:constructor phpinspect--make-variable))
"A PHP Variable."
diff --git a/phpinspect-util.el b/phpinspect-util.el
index 0f6e6ad279..f79b6c8a5e 100644
--- a/phpinspect-util.el
+++ b/phpinspect-util.el
@@ -1,6 +1,6 @@
;;; phpinspect-util.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
diff --git a/phpinspect-worker.el b/phpinspect-worker.el
index b9bfe4fc39..4df35d6a8e 100644
--- a/phpinspect-worker.el
+++ b/phpinspect-worker.el
@@ -1,6 +1,6 @@
;; phpinspect-worker.el --- PHP parsing and completion package -*-
lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
@@ -134,7 +134,7 @@ already present in the queue."
;; This error is used to wake up the thread when new tasks are added to
the
;; queue.
(condition-case err
- (ignore-error 'phpinspect-wakeup-thread
+ (ignore-error phpinspect-wakeup-thread
(let* ((task (phpinspect-queue-dequeue (phpinspect-worker-queue
worker)))
(mx (make-mutex))
(continue (make-condition-variable mx)))
diff --git a/phpinspect.el b/phpinspect.el
index 6f2f0fa46c..6785f63e38 100644
--- a/phpinspect.el
+++ b/phpinspect.el
@@ -1,6 +1,6 @@
;;; phpinspect.el --- PHP parsing and completion package -*- lexical-binding:
t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc
;; Author: Hugo Thunnissen <de...@hugot.nl>
;; Keywords: php, languages, tools, convenience
@@ -175,14 +175,14 @@ at point (capf) functions:
(defun my-php-personal-hook ()
;; Shortcut to add use statements for classes you use.
- (define-key php-mode-map (kbd \"C-c u\") 'phpinspect-fix-imports)
+ (define-key php-mode-map (kbd \"C-c u\") #\\='phpinspect-fix-imports)
;; Shortcuts to quickly search/open files of PHP classes.
;; You can make these local to php-mode, but making them global
;; like this makes them work in other modes/filetypes as well, which
;; can be handy when jumping between templates, config files and PHP code.
- (global-set-key (kbd \"C-c a\") 'phpinspect-find-class-file)
- (global-set-key (kbd \"C-c c\") 'phpinspect-find-own-class-file)
+ (global-set-key (kbd \"C-c a\") #\\='phpinspect-find-class-file)
+ (global-set-key (kbd \"C-c c\") #\\='phpinspect-find-own-class-file)
;; Enable phpinspect-mode
(phpinspect-mode))
@@ -297,7 +297,7 @@ Example configuration for `company-mode':
(defun phpinspect-get-all-fqns (&optional filter)
"Return a list of all FQNS congruent with FILTER in the currently active
project.
-FILTER must be nil or the symbol 'own' if FILTER is 'own', only
+FILTER must be nil or the symbol `own' if FILTER is `own', only
fully qualified names from the project's source, and not its
dependencies, are returned."
(let* ((project (phpinspect--cache-get-project-create
diff --git a/test/phpinspect-test.el b/test/phpinspect-test.el
index c1ca0725d9..5501af202f 100644
--- a/test/phpinspect-test.el
+++ b/test/phpinspect-test.el
@@ -1,6 +1,6 @@
;;; phpinspect-test.el --- Unit tests for phpinspect.el -*- lexical-binding:
t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-autoload.el b/test/test-autoload.el
index 481c06e337..a9b9bf4046 100644
--- a/test/test-autoload.el
+++ b/test/test-autoload.el
@@ -1,6 +1,6 @@
; test-autoload.el --- Unit tests for phpinspect.el -*- lexical-binding: t;
-*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-buffer.el b/test/test-buffer.el
index 53761523b9..5d98719418 100644
--- a/test/test-buffer.el
+++ b/test/test-buffer.el
@@ -1,6 +1,6 @@
;; test-buffer.el --- Unit tests for phpinspect.el -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-class.el b/test/test-class.el
index 35c0ea7f36..670feddbe9 100644
--- a/test/test-class.el
+++ b/test/test-class.el
@@ -1,6 +1,6 @@
;; test-class.el --- Unit tests for phpinspect.el -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-fs.el b/test/test-fs.el
index c15f447fa3..baec5c4f79 100644
--- a/test/test-fs.el
+++ b/test/test-fs.el
@@ -1,6 +1,6 @@
;;; test-autoload.el --- Unit tests for phpinspect.el -*- lexical-binding: t;
-*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-index.el b/test/test-index.el
index ffea7fb505..232cc1c9ae 100644
--- a/test/test-index.el
+++ b/test/test-index.el
@@ -1,6 +1,6 @@
;;; test-index.el --- Unit tests for phpinspect.el -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-meta.el b/test/test-meta.el
index f20e3ebe77..df85c81b9e 100644
--- a/test/test-meta.el
+++ b/test/test-meta.el
@@ -1,6 +1,6 @@
;; test-meta.el --- Unit tests for phpinspect.el -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-parse-context.el b/test/test-parse-context.el
index 82ae1cff77..a9d69c2384 100644
--- a/test/test-parse-context.el
+++ b/test/test-parse-context.el
@@ -1,6 +1,6 @@
;;; phpinspect-test.el --- Unit tests for phpinspect.el -*- lexical-binding:
t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-parser.el b/test/test-parser.el
index 83e5fca60f..a7b3660d67 100644
--- a/test/test-parser.el
+++ b/test/test-parser.el
@@ -1,6 +1,6 @@
;; test-parser.el --- Unit tests for phpinspect.el -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-pipeline.el b/test/test-pipeline.el
index d755f338ae..f9c1ed04a3 100644
--- a/test/test-pipeline.el
+++ b/test/test-pipeline.el
@@ -1,6 +1,6 @@
;;; test-pipeline.el --- Unit tests for phpinspect.el -*- lexical-binding: t;
-*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-project.el b/test/test-project.el
index a2adb37b1d..b421eebc7c 100644
--- a/test/test-project.el
+++ b/test/test-project.el
@@ -1,6 +1,6 @@
;; test-project.el --- Unit tests for phpinspect.el -*- lexical-binding: t;
-*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-splayt.el b/test/test-splayt.el
index cf64dd51d4..07f37c6e96 100644
--- a/test/test-splayt.el
+++ b/test/test-splayt.el
@@ -1,6 +1,6 @@
;; test-splayt.el --- Unit tests for phpinspect.el -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-type.el b/test/test-type.el
index 98ed1df981..47b212e544 100644
--- a/test/test-type.el
+++ b/test/test-type.el
@@ -1,6 +1,6 @@
;; test-type.el --- Unit tests for phpinspect.el -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-util.el b/test/test-util.el
index 3b6111b554..63ead980d2 100644
--- a/test/test-util.el
+++ b/test/test-util.el
@@ -1,6 +1,6 @@
;; test-util.el --- Unit tests for phpinspect.el -*- lexical-binding: t; -*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
diff --git a/test/test-worker.el b/test/test-worker.el
index 88916a33c7..c27426a680 100644
--- a/test/test-worker.el
+++ b/test/test-worker.el
@@ -1,6 +1,6 @@
;;; test-worker.el --- Unit tests for phpinspect.el -*- lexical-binding: t;
-*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
;; Author: Hugo Thunnissen <de...@hugot.nl>
