Skip to content

Commit 560fd54

Browse files
authored
build: fix precommit whitespace issues (#15652)
Will have to come back to the huge DFA, but this fixes most of the huge list
1 parent 999c1a4 commit 560fd54

File tree

55 files changed

+36
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+36
-111
lines changed

.dir-locals.el

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
;; set up Lucene style for emacs
22
((java-mode . ((c-basic-offset . 2))))
3-

.github/actionlint.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@ paths:
2121
- 'shellcheck reported issue in this script: SC2129:.+'
2222
# TODO: another style issue
2323
- 'shellcheck reported issue in this script: SC2236:.+'
24-

.pre-commit-config.yml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,44 +22,20 @@ repos:
2222
- id: trailing-whitespace
2323
name: Fix trailing whitespace
2424
types: [ text ]
25-
# TODO: fix these files
2625
exclude:
2726
glob:
28-
- lucene/demo/src/test/org/apache/lucene/demo/test-files/docs/*.txt
29-
- lucene/analysis/common/src/resources/org/apache/lucene/analysis/**/stopwords.txt
3027
- lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
31-
- lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/checkcompoundrep.aff
3228

3329
- id: end-of-file-fixer
3430
name: Fix newline at EOF
35-
# TODO: fix these files
3631
exclude:
3732
glob:
38-
- .dir-locals.el
39-
- .github/actionlint.yaml
40-
- dev-tools/scripts/README.md
41-
- gradle/documentation/render-javadoc/custom_styles.css
42-
- help/*.txt
43-
- LICENSE.txt
44-
- lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex
45-
- lucene/analysis/common/src/resources/org/apache/lucene/analysis/bn/stopwords.txt
46-
- lucene/analysis/common/src/resources/org/apache/lucene/analysis/snowball/*.txt
47-
- lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/*.htm
48-
- lucene/analysis/common/src/test/org/apache/lucene/analysis/email/*.{txt,html}
49-
- lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/*.{aff,dic}
50-
- lucene/analysis/common/src/test/org/apache/lucene/analysis/no/*.txt
51-
- lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/synonyms.txt
52-
- lucene/analysis/icu/src/data/utr30/*.txt
53-
- lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/*.rbbi
54-
- lucene/benchmark/conf/*.alg
55-
- lucene/demo/src/test/org/apache/lucene/demo/test-files/docs/*.txt
56-
- lucene/distribution/src/binary-release/README.md
57-
- lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/CambridgeMA.utf8
58-
- lucene/licenses/*.txt
59-
- lucene/misc/src/java/org/apache/lucene/misc/doc-files/*.svg
60-
- lucene/test-framework/src/resources/org/apache/lucene/tests/index/LICENSE.txt
61-
- lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj
33+
# generated file
6234
- versions.lock
35+
# generated file
36+
- lucene/analysis/common/src/resources/org/apache/lucene/analysis/snowball/*_stop.txt
37+
# TODO: do this one later with more free RAM
38+
- lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex
6339

6440
- id: fix-byte-order-marker
6541
name: Fix UTF-8 byte order marker

LICENSE.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,4 +504,3 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
504504
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
505505
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
506506
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
507-

gradle/documentation/render-javadoc/custom_styles.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,3 @@ span.highlight {
3838
padding-bottom: 2px;
3939
border-bottom: 2px solid red;
4040
}
41-

help/formatting.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,3 @@ the lucene.spotlessGradleScripts option to false - either on command line
4949
using -Plucene.spotlessGradleScripts=false, in your local
5050
build-options.local.properties or by any other means build options can be
5151
set.
52-

help/jmh.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,3 @@ Also you must run benchmarks as root to use dtrace, but it works.
6767
$ vi jdk/src/utils/hsdis/binutils/hsdis-binutils.c, change #include "hsdis.h" to #include "../hsdis.h"
6868
$ (cd jdk/src/utils/hsdis/binutils && make BINUTILS=../../../../../binutils-2.38 ARCH=aarch64)
6969
$ cp jdk/src/utils/hsdis/binutils/build/macosx-aarch64/hsdis-aarch64.dylib $JAVA_HOME/lib/server
70-

help/publishing.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,5 +130,3 @@ If this is not possible, then you should avoid using an external GPG process, an
130130

131131
This may mean that there is a problem preventing `gpg` from communicating correctly with the `gpg-agent` (and/or invoking your `pinentry`
132132
program) that is independent of gradle. Try running `pkill gpg-agent` and then retrying your `./gradlew` command
133-
134-

lucene/analysis/common/src/resources/org/apache/lucene/analysis/bn/stopwords.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@
118118
যাওয়া
119119
রকম
120120
সাধারণ
121-
কমনে
121+
কমনে

lucene/analysis/common/src/resources/org/apache/lucene/analysis/el/stopwords.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Lucene Greek Stopwords list
22
# Note: by default this file is used after GreekLowerCaseFilter,
3-
# so when modifying this file use 'σ' instead of 'ς'
3+
# so when modifying this file use 'σ' instead of 'ς'
44
ο
55
η
66
το
@@ -11,7 +11,7 @@
1111
των
1212
τον
1313
την
14-
και
14+
και
1515
κι
1616
κ
1717
ειμαι

0 commit comments

Comments
 (0)