Merge pull request #1440 from Enselic/fix-1438-newline-can-be-added-even-if-style-plain

Don't add artificial newline to last line if --style=plain
2025-08-17 19:42:19 +02:00 · 2020-12-21 09:24:26 +01:00
parent c1e4746d50 3e9afe2974
commit cc7b89faf8
19 changed files with 31 additions and 19 deletions
--- a/tests/syntax-tests/highlighted/Plaintext/plaintext.txt
+++ b/tests/syntax-tests/highlighted/Plaintext/plaintext.txt
@@ -175,4 +175,4 @@
 [38;2;117;113;94m\u{ad}[0m[38;2;249;38;114m␊[0m
 [38;2;117;113;94m\u{ae}[0m[38;2;249;38;114m␊[0m
 [38;2;249;38;114m␊[0m
-[38;2;248;248;242mHere's[0m[38;2;102;217;239m·[0m[38;2;248;248;242ma[0m[38;2;102;217;239m·[0m[38;2;248;248;242mline[0m[38;2;102;217;239m·[0m[38;2;248;248;242mwith[0m[38;2;102;217;239m·[0m[38;2;248;248;242mmultiple[0m[38;2;102;217;239m·[0m[38;2;248;248;242mcharacters.[0m
+[38;2;248;248;242mHere's[0m[38;2;102;217;239m·[0m[38;2;248;248;242ma[0m[38;2;102;217;239m·[0m[38;2;248;248;242mline[0m[38;2;102;217;239m·[0m[38;2;248;248;242mwith[0m[38;2;102;217;239m·[0m[38;2;248;248;242mmultiple[0m[38;2;102;217;239m·[0m[38;2;248;248;242mcharacters.[0m[38;2;249;38;114m␊[0m
--- a/tests/syntax-tests/source/ActionScript/test.as
+++ b/tests/syntax-tests/source/ActionScript/test.as
@@ -72,4 +72,4 @@ package TestSyntax {
            var sndChannel:SoundChannel = mySound.play();
        }
    }
-}
+}
--- a/tests/syntax-tests/source/Batch/build.bat
+++ b/tests/syntax-tests/source/Batch/build.bat
@@ -56,4 +56,4 @@ set LDLIBS= ^
    @set "LINK_FILES=%LINK_FILES% %%~f"
 )

-lld-link.exe %LINK_FILES% -out:"%OUTPUT%" %LDFLAGS% %LDLIBS%
+lld-link.exe %LINK_FILES% -out:"%OUTPUT%" %LDFLAGS% %LDLIBS%
--- a/tests/syntax-tests/source/Clojure/test.clj
+++ b/tests/syntax-tests/source/Clojure/test.clj
@@ -55,4 +55,4 @@
    (println (factorial 5))
    (log)
    (log "Message"))
-  
+  
--- a/tests/syntax-tests/source/Dockerfile/Dockerfile
+++ b/tests/syntax-tests/source/Dockerfile/Dockerfile
@@ -16,4 +16,4 @@ EXPOSE 80/tcp

 VOLUME [/var/lib/mysql/data]

-ENTRYPOINT ["/usr/bin/entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/entrypoint.sh"]
--- a/Attributes/example.gitattributes
+++ b/Attributes/example.gitattributes
@@ -13,4 +13,4 @@
 *.patch    -text

 .gitattributes linguist-language=gitattributes
-.gitkeep       export-ignore
+.gitkeep       export-ignore
--- a/tests/syntax-tests/source/Git
+++ b/tests/syntax-tests/source/Git
@@ -104,4 +104,4 @@
 [user]
 	email = f.nord@example.com
 	name = Frank Nord
-	signingkey = AAAAAAAAAAAAAAAA
+	signingkey = AAAAAAAAAAAAAAAA
--- a/tests/syntax-tests/source/Hosts/hosts
+++ b/tests/syntax-tests/source/Hosts/hosts
@@ -5,4 +5,4 @@
 192.160.0.200        try.sample.test try     #another comment
 216.58.223.238       google.com

-::1 localhost.try ip6-localhost
+::1 localhost.try ip6-localhost
--- a/tests/syntax-tests/source/Makefile/Makefile
+++ b/tests/syntax-tests/source/Makefile/Makefile
@@ -382,4 +382,4 @@ install: all
 	@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME)

 uninstall:
-	rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)}
+	rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)}
--- a/tests/syntax-tests/source/PHP/test.php
+++ b/tests/syntax-tests/source/PHP/test.php
@@ -108,4 +108,4 @@ $doe->setName('John Doe');

 $ending = 2 > 3 ? "yep" : "nah";

-?>
+?>
--- a/tests/syntax-tests/source/Plaintext/plaintext.txt
+++ b/tests/syntax-tests/source/Plaintext/plaintext.txt
--- a/tests/syntax-tests/source/PowerShell/test.ps1
+++ b/tests/syntax-tests/source/PowerShell/test.ps1
--- a/tests/syntax-tests/source/RequirementsTXT/requirements.txt
+++ b/tests/syntax-tests/source/RequirementsTXT/requirements.txt
@@ -5,4 +5,4 @@ pywheels>=12.4 #a whitespace followed by comments
 Nuitka<0.6.8.4
 wxPython>=1.0, <=2.1

-#this is another comment
+#this is another comment
--- a/tests/syntax-tests/source/YAML/example.yaml
+++ b/tests/syntax-tests/source/YAML/example.yaml
@@ -31,4 +31,4 @@ emails:
      - bob@example.com
      - bill@example.com
    supervisors:
-      - george@example.com
+      - george@example.com
--- a/tests/syntax-tests/source/reStructuredText/reference.rst
+++ b/tests/syntax-tests/source/reStructuredText/reference.rst
@@ -317,4 +317,4 @@ blank lines before and after.)
 ..

        So this block is not "lost",
-        despite its indentation.
+        despite its indentation.