Merge pull request SeasideSt#123 from SeasideSt/122-Replace-ascii-encoding-for-non-binary-files-with-utf-8-encoding

Johan Brichau · web-flow · commit 1c04d7b2c53b · 2021-08-16T11:50:41.000+02:00
Treat text files as utf8 encoded rather than ascii (in Pharo only for now)
diff --git a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st
@@ -4,4 +4,4 @@ readFileStreamOn: aString do: aBlock binary: aBoolean
 
 	^ aBoolean
 		ifTrue: [ aString asFileReference binaryReadStreamDo: aBlock ]
-		ifFalse: [ aString asFileReference readStreamEncoded: 'ascii' do: aBlock ]
+		ifFalse: [ aString asFileReference readStreamEncoded: 'utf-8' do: aBlock ]
diff --git a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st
@@ -2,4 +2,4 @@ file library
 writeFileStreamOn: aString do: aBlock binary: aBoolean
 	^ aBoolean
 		ifTrue: [ aString asFileReference binaryWriteStreamDo: aBlock ]
-		ifFalse: [ aString asFileReference writeStreamEncoded: 'ascii' do: aBlock ]
+		ifFalse: [ aString asFileReference writeStreamEncoded: 'utf-8' do: aBlock ]
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st
@@ -3,4 +3,4 @@ readFileStreamOn: aString do: aBlock binary: aBoolean
 
 	^ aBoolean
 		ifTrue: [ aString asFileReference binaryReadStreamDo: aBlock ]
-		ifFalse: [ aString asFileReference readStreamEncoded: 'ascii' do: aBlock ]
+		ifFalse: [ aString asFileReference readStreamEncoded: 'utf-8' do: aBlock ]
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st
@@ -2,4 +2,4 @@ file library
 writeFileStreamOn: aString do: aBlock binary: aBoolean
 	^ aBoolean
 		ifTrue: [ aString asFileReference binaryWriteStreamDo: aBlock ]
-		ifFalse: [ aString asFileReference writeStreamEncoded: 'ascii' do: [ :str | aBlock value: (ZnNewLineWriterStream on: str) ] ]
+		ifFalse: [ aString asFileReference writeStreamEncoded: 'utf-8' do: [ :str | aBlock value: (ZnNewLineWriterStream on: str) ] ]
diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderTextUTF8.st b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderTextUTF8.st
@@ -0,0 +1,7 @@
+tests-filestreams
+testReadWriteToFileInFolderTextUTF8
+	#('Übèrstrîñgé' '£ęλ~') do:[ :text | 
+		self 
+			writeToFile: text 
+			withFileNameDo:[ :fileName |
+				self assert: text equals: (GRPlatform current contentsOfFile: fileName binary: false) ] ].
