EXPORT VERSION 60476

pharo-project · guillep · Mar 14, 2017 · Mar 14, 2017 · Mar 16, 2017 · Mar 16, 2017
commit 906c3e740b523f4adcb832274288ec920966d182
diff --git a/src/HelpSystem-Core.package/CustomHelp.class/class/bold..st b/src/HelpSystem-Core.package/CustomHelp.class/class/bold..st
@@ -1,5 +1,5 @@
 formatting
 bold: aString
 	"Return Text object with bold emphasis."
-	aString size = 0 ifTrue: [^self].
+	aString ifEmpty: [ self errorEmptyString ].
 	^ aString asText addAttribute: TextEmphasis bold from: 1 to: aString size.
diff --git a/src/HelpSystem-Core.package/CustomHelp.class/class/doItFrom..st b/src/HelpSystem-Core.package/CustomHelp.class/class/doItFrom..st
@@ -6,7 +6,7 @@ doItFrom: aString
 
 	color := Color fromHexString: 'aa5693'.
 
-	aString size = 0 ifTrue: [^self].
+	aString ifEmpty: [ self errorEmptyString ].
 	^ aString asText
 		addAttribute: (TextAction new actOnClickBlock: [
 				Smalltalk compiler evaluate: aString]; yourself) 

diff --git a/src/HelpSystem-Core.package/CustomHelp.class/class/doItScriptFrom..st b/src/HelpSystem-Core.package/CustomHelp.class/class/doItScriptFrom..st
@@ -6,7 +6,7 @@ doItScriptFrom: aString
 
 	| color text clipboard run |
 	color := Color fromHexString: 'aa5693'.
-	aString size = 0 ifTrue: [ ^ self ].
+	aString ifEmpty: [ self errorEmptyString ].
 	text := aString asText
 		addAttribute: (TextColor new color: color);
 		yourself.

diff --git a/src/HelpSystem-Core.package/CustomHelp.class/class/errorEmptyString.st b/src/HelpSystem-Core.package/CustomHelp.class/class/errorEmptyString.st
@@ -0,0 +1,4 @@
+errors
+errorEmptyString
+
+	self error: 'Expected a non empty string'
diff --git a/src/HelpSystem-Core.package/CustomHelp.class/class/heading..st b/src/HelpSystem-Core.package/CustomHelp.class/class/heading..st
@@ -7,7 +7,7 @@ heading: aString
 	font := (LogicalFont familyName: 'Source Sans Pro' pointSize: 20).
 	color := Color fromHexString: '3196D3'.
 
-	aString size = 0 ifTrue: [^self].
+	aString ifEmpty: [ self errorEmptyString ].
 	^ (aString asText, String cr, String cr)
 		addAttribute: (TextFontReference toFont: font) from: 1 to: aString size;
 		addAttribute: TextEmphasis bold from: 1 to: aString size;

diff --git a/src/HelpSystem-Core.package/CustomHelp.class/class/underlined..st b/src/HelpSystem-Core.package/CustomHelp.class/class/underlined..st
@@ -1,5 +1,6 @@
 formatting
 underlined: aString
 	"Return Text object with underlined emphasis."
-	aString size = 0 ifTrue: [^self].
+	aString ifEmpty: [ self errorEmptyString ].
+
 	^ aString asText addAttribute: TextEmphasis underlined from: 1 to: aString size.
diff --git a/src/HelpSystem-Core.package/CustomHelp.class/class/url..st b/src/HelpSystem-Core.package/CustomHelp.class/class/url..st
@@ -1,16 +1,23 @@
 formatting
 url: aString
 	"Return Text object with copy aString to the clipboard after mouse click."
-	| color |
+	| color clickBlock |
+
+	aString ifEmpty: [ self errorEmptyString ].
 
 	color := Color fromHexString: '2176B3'.
+
+	clickBlock := [ 
+		self environment 
+			at: #WebBrowser 
+			ifPresent: [ :browserClass | browserClass openOn: aString ]
+			ifAbsent: [ 
+				Clipboard clipboardText: aString.
+				self inform: 'The URL has been pasted into your clipboard'.
+			]
+	].
 
-	aString size = 0 ifTrue: [^self].
-	^ aString asText
-		addAttribute: (TextAction new actOnClickBlock: [
-				Clipboard clipboardText: aString. 
-				self inform: 'The URL has been pasted into your clipboard']) 
-			from: 1
-			to: aString size;
-		addAttribute: (TextColor new color: color) from: 1 to: aString size;
+	^ aString asText 
+		addAttribute: (	TextAction new actOnClickBlock: clickBlock);
+		addAttribute: (TextColor new color: color);
 		yourself
diff --git a/src/Pharo-Help.package/WelcomeHelp.class/class/useExternalPackages.st b/src/Pharo-Help.package/WelcomeHelp.class/class/useExternalPackages.st
@@ -2,7 +2,7 @@ pages
 useExternalPackages
 	^ HelpTopic 
 		title: 'Use external packages'
-		contents: (self heading: 'Use external packages'), 'Pharo 5.0 already comes pre-loaded with a rich set of packages that you can use to explore the system and develop your own applications. However there is also a huge library of user contributed projects that you can also load using the "Catalog Browser". To open it click on the following expression:
+		contents: (self heading: 'Use external packages'), 'Pharo already comes pre-loaded with a rich set of packages that you can use to explore the system and develop your own applications. However there is also a huge library of user contributed projects that you can also load using the "Catalog Browser". To open it click on the following expression:
 
 ', (self doItFrom: 'CatalogBrowser open.'), '
 

diff --git a/src/ScriptLoader60.package/ScriptLoader.class/instance/commentForCurrentUpdate.st b/src/ScriptLoader60.package/ScriptLoader.class/instance/commentForCurrentUpdate.st
@@ -1,13 +1,13 @@
 public
 commentForCurrentUpdate
- ^ '19993 Provide comment for TAbleToRotate
-	https://pharo.fogbugz.com/f/cases/19993
+ ^ '19985 SourceFileArray should be encoding independent when read preamble of methods 
+	https://pharo.fogbugz.com/f/cases/19985
 
-19959 base local Metaclass and ClassTrait methods tests on pragmas 
-	https://pharo.fogbugz.com/f/cases/19959
+20003 useExternalPackages mentions Pharo 5.0 although in Pharo 6.0
+	https://pharo.fogbugz.com/f/cases/20003
 
-19989 testAllCallsOnASymbol can fail easily
-	https://pharo.fogbugz.com/f/cases/19989
+20000 HelpBrowser should open real browser when "WebBrowser" is loaded
+	https://pharo.fogbugz.com/f/cases/20000
 
-19997 Cleanup the Help menu (order)
-	https://pharo.fogbugz.com/f/cases/19997'
+19998 Settings Syntax highlighting "set to default" crashes the image
+	https://pharo.fogbugz.com/f/cases/19998'
diff --git a/...criptLoader.class/instance/script60475.st → ...criptLoader.class/instance/script60476.st b/...criptLoader.class/instance/script60475.st → ...criptLoader.class/instance/script60476.st
@@ -1,5 +1,5 @@
 pharo - scripts
-script60475
+script60476
 
 	^ 'AST-Core-TheIntegrator.494.mcz
 AST-Tests-Core-TheIntegrator.134.mcz
@@ -140,7 +140,7 @@ Graphics-Shapes-TheIntegrator.4.mcz
 Graphics-Tests-TheIntegrator.85.mcz
 Graphics-Transformations-TheIntegrator.17.mcz
 Growl-TheIntegrator.47.mcz
-HelpSystem-Core-TheIntegrator.174.mcz
+HelpSystem-Core-TheIntegrator.176.mcz
 HelpSystem-Tests-TheIntegrator.32.mcz
 Hiedra-MartinDias.146.mcz
 HiedraTests-MartinDias.2.mcz
@@ -251,7 +251,7 @@ OmbuTests-MartinDias.33.mcz
 OpalCompiler-Core-TheIntegrator.890.mcz
 OpalCompiler-Tests-TheIntegrator.380.mcz
 OpalTools-TheIntegrator.24.mcz
-Pharo-Help-TheIntegrator.38.mcz
+Pharo-Help-TheIntegrator.40.mcz
 PharoBootstrap-Initialization-TheIntegrator.4.mcz
 PharoDocComment-StephaneDucasse.6.mcz
 Polymorph-Widgets-TheIntegrator.1430.mcz
@@ -366,11 +366,11 @@ System-Platforms-TheIntegrator.85.mcz
 System-Serial Port-StephaneDucasse.23.mcz
 System-SessionManager-TheIntegrator.41.mcz
 System-SessionManager-Tests-ChristopheDemarey.9.mcz
-System-Settings-TheIntegrator.372.mcz
+System-Settings-TheIntegrator.374.mcz
 System-Settings-Rules-TheIntegrator.2.mcz
 System-Settings-Tests-TheIntegrator.15.mcz
 System-Sound-TheIntegrator.20.mcz
-System-Sources-TheIntegrator.69.mcz
+System-Sources-TheIntegrator.71.mcz
 System-Support-TheIntegrator.1274.mcz
 System-Support-Rules-TheIntegrator.2.mcz
 System-SupportTests-TheIntegrator.7.mcz

diff --git a/src/ScriptLoader60.package/ScriptLoader.class/instance/update60475.st b/src/ScriptLoader60.package/ScriptLoader.class/instance/update60475.st
diff --git a/src/ScriptLoader60.package/ScriptLoader.class/instance/update60476.st b/src/ScriptLoader60.package/ScriptLoader.class/instance/update60476.st
@@ -0,0 +1,18 @@
+pharo - updates
+update60476
+	"self new update60476"
+	self withUpdateLog: '19985 SourceFileArray should be encoding independent when read preamble of methods 
+	https://pharo.fogbugz.com/f/cases/19985
+
+20003 useExternalPackages mentions Pharo 5.0 although in Pharo 6.0
+	https://pharo.fogbugz.com/f/cases/20003
+
+20000 HelpBrowser should open real browser when "WebBrowser" is loaded
+	https://pharo.fogbugz.com/f/cases/20000
+
+19998 Settings Syntax highlighting "set to default" crashes the image
+	https://pharo.fogbugz.com/f/cases/19998'.
+	self loadTogether: self script60476 merge: false.
+
+SettingDeclaration initialize.
+	self flushCaches.
diff --git a/src/System-Settings.package/SettingDeclaration.class/class/initialize.st b/src/System-Settings.package/SettingDeclaration.class/class/initialize.st
@@ -0,0 +1,4 @@
+initialization
+initialize
+
+	UniqueObject := Object new
diff --git a/src/System-Settings.package/SettingDeclaration.class/instance/hasDefault.st b/src/System-Settings.package/SettingDeclaration.class/instance/hasDefault.st
@@ -1,3 +1,3 @@
 testing
 hasDefault
-	^ true
+	^ default ~~ UniqueObject
diff --git a/src/System-Settings.package/SettingDeclaration.class/instance/initialize.st b/src/System-Settings.package/SettingDeclaration.class/instance/initialize.st
@@ -0,0 +1,6 @@
+initialization
+initialize
+
+	super initialize.
+
+	default := UniqueObject
diff --git a/src/System-Settings.package/SettingDeclaration.class/instance/setToDefault.st b/src/System-Settings.package/SettingDeclaration.class/instance/setToDefault.st
@@ -1,3 +1,4 @@
 user interface
 setToDefault
+
 	self realValue: self defaultValue.
diff --git a/src/System-Settings.package/SettingDeclaration.class/properties.json b/src/System-Settings.package/SettingDeclaration.class/properties.json
@@ -5,6 +5,7 @@
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [
+		"UniqueObject",
 		"ValueListCache"
 	],
 	"instvars" : [

diff --git a/src/System-Sources.package/SourceFileArray.class/instance/getPreambleFrom.at..st b/src/System-Sources.package/SourceFileArray.class/instance/getPreambleFrom.at..st
@@ -1,12 +1,14 @@
 public - string reading
 getPreambleFrom: aFileStream at: position
+	"To read preamble of method we need read back characters until $!.
+	But given aFileStream can have UTF8 encoding which make it a bit tricky to scan stream in reverse order.
+	First we need to move back in stream using byte reading without encoding. It performed by basicNext.
+	Next we still could not read exact number of characters because (position-startIndex) is not characters number in case of UTF8.
+	So at the end we use another loop to read encoded characters step by step until stream will be at original position"
+	| startIndex |
+	startIndex := position.
+	[startIndex >= 0 and: [aFileStream position: startIndex.
+	aFileStream basicNext ~~ $!] ] whileTrue: [ startIndex := startIndex - 1 ].
 
-	| writeStream |
-	writeStream := String new writeStream.
-	position to: 0 by: -1 do: [ :index | 
-		| aCharacter |
-		aFileStream position: index.
-		aCharacter := aFileStream basicNext.
-		aCharacter == $!
-			ifTrue: [ ^ writeStream contents reversed ]
-			ifFalse: [ writeStream nextPut: aCharacter ] ]
+	^String streamContents: [ :result | 
+		[aFileStream position <= position] whileTrue: [result nextPut: aFileStream next]]