EXPORT VERSION 60479

pharo-project · guillep · Mar 14, 2017 · Mar 14, 2017 · Mar 16, 2017 · Mar 16, 2017
commit 900451f37fdf32428d95cb337d9c8651403a19bf
diff --git a/src/GT-Debugger.package/GTDebuggerInspector.class/instance/compose.st b/src/GT-Debugger.package/GTDebuggerInspector.class/instance/compose.st
@@ -4,9 +4,10 @@ compose
 		minimumPageNumberForScrollbar: 2; 
 		show: [ :a :each | 
 			a dynamic display: [ :x | 
-				GLMCompositePresentation new with: [ :aComposite | 
+				(GLMCompositePresentation new with: [ :aComposite | 
 					each gtDebuggerPresentationsIn: aComposite inContext: self.
 					self attachExtraBehaviourToPresentationsIn: aComposite.
-					aComposite ] ] ].
+					aComposite ])
+						startOn: x ] ].
 	self first when: GLMPaneAdded send: #actOnPaneAdded: to: self.
 	self first when: GLMPaneRemoved send: #actOnPaneRemoved: to: self
diff --git a/src/GT-Inspector.package/GTSimpleMethodsBrowser.class/instance/sourceOf.for.in..st b/src/GT-Inspector.package/GTSimpleMethodsBrowser.class/instance/sourceOf.for.in..st
@@ -8,17 +8,8 @@ sourceOf: method for: object in: composite
 			on: $g
 			entitled: 'Do it and go'
 			with: [ :text | Smalltalk compiler evaluate: text selectedText for: object logged: false ];
-		act: [ :text :m | self updateOuterPaneFrom: text for: method ]
+		installDefaultSelectionActions;
+		selectionAct: [ :text | self updateOuterPaneFrom: text for: method ]
 			icon: GLMUIThemeExtraIcons glamorousAccept
 			on: $s
-			entitled: 'Accept';
-		act: [ :text :m | 
-			Smalltalk tools browser 
-				openOnClass: m methodClass 
-				selector: m selector ]
-			icon: GLMUIThemeExtraIcons glamorousBrowse
-			entitled: 'Browse';
-		act: [ :text :m | 
-			(text pane port: #evaluatedObject) value: m ]
-			icon: GLMUIThemeExtraIcons glamorousInspect
-			entitled: 'Inspect'
+			entitled: 'Accept'
diff --git a/src/ScriptLoader60.package/ScriptLoader.class/instance/commentForCurrentUpdate.st b/src/ScriptLoader60.package/ScriptLoader.class/instance/commentForCurrentUpdate.st
@@ -1,10 +1,10 @@
 public
 commentForCurrentUpdate
- ^ '19909 Versionner reset modifications of first opened project when user opens another project in addition
-	https://pharo.fogbugz.com/f/cases/19909
+ ^ '20011 OSEnvironment>>getEnv: needs to use a primitive
+	https://pharo.fogbugz.com/f/cases/20011
 
-19981 Class side slot initialization does not work
-	https://pharo.fogbugz.com/f/cases/19981
+19936 The code presentation in the Meta tab cuts the scrollbar at the bottom
+	https://pharo.fogbugz.com/f/cases/19936
 
-20004 SnapshotDone should be after all startup actions
-	https://pharo.fogbugz.com/f/cases/20004'
+19897 Problem with presentations containing tabulators in the inspector from the debugger
+	https://pharo.fogbugz.com/f/cases/19897'
diff --git a/...criptLoader.class/instance/script60477.st → ...criptLoader.class/instance/script60479.st b/...criptLoader.class/instance/script60477.st → ...criptLoader.class/instance/script60479.st
@@ -1,5 +1,5 @@
 pharo - scripts
-script60477
+script60479
 
 	^ 'AST-Core-TheIntegrator.494.mcz
 AST-Tests-Core-TheIntegrator.134.mcz
@@ -94,10 +94,10 @@ FuelTools-Debugger-MaxLeske.14.mcz
 FuzzyMatcher-TheIntegrator.20.mcz
 FuzzyMatcher-Tests-TheIntegrator.8.mcz
 GT-BytecodeDebugger-AndreiChis.36.mcz
-GT-Debugger-AndreiChis.380.mcz
+GT-Debugger-TheIntegrator.383.mcz
 GT-EventRecorder-TheIntegrator.81.mcz
 GT-EventRecorder-Tests-TheIntegrator.42.mcz
-GT-Inspector-AliakseiSyrel.466.mcz
+GT-Inspector-TheIntegrator.468.mcz
 GT-InspectorExtensions-Core-AndreiChis.259.mcz
 GT-Playground-TheIntegrator.148.mcz
 GT-SUnitDebugger-TudorGirba.39.mcz
@@ -360,7 +360,7 @@ System-Installers-TheIntegrator.44.mcz
 System-Localization-TheIntegrator.108.mcz
 System-Localization-Tests-TheIntegrator.8.mcz
 System-Model-TheIntegrator.13.mcz
-System-OSEnvironments-TheIntegrator.33.mcz
+System-OSEnvironments-TheIntegrator.35.mcz
 System-Object Events-TheIntegrator.28.mcz
 System-Platforms-TheIntegrator.85.mcz
 System-Serial Port-StephaneDucasse.23.mcz
@@ -386,7 +386,7 @@ Tool-Base-TheIntegrator.195.mcz
 Tool-Catalog-TheIntegrator.61.mcz
 Tool-CriticBrowser-TheIntegrator.67.mcz
 Tool-DependencyAnalyser-ChristopheDemarey.31.mcz
-Tool-DependencyAnalyser-Test-ChristopheDemarey.16.mcz
+Tool-DependencyAnalyser-Test-TheIntegrator.18.mcz
 Tool-DependencyAnalyser-Test-Data-ChristopheDemarey.2.mcz
 Tool-DependencyAnalyser-UI-ChristopheDemarey.54.mcz
 Tool-Diff-TheIntegrator.49.mcz
@@ -417,16 +417,16 @@ UnifiedFFI-Legacy-TheIntegrator.4.mcz
 UnifiedFFI-Tests-TheIntegrator.42.mcz
 UpdateStreamer-Core-TheIntegrator.34.mcz
 UpdateStreamer-Tests-TheIntegrator.9.mcz
-Versionner-Commit-TheIntegrator.38.mcz
+Versionner-Commit-TheIntegrator.34.mcz
 Versionner-Core-Announcements-ChristopheDemarey.6.mcz
 Versionner-Core-Commands-MarcusDenker.65.mcz
 Versionner-Core-DependenciesModel-MarcusDenker.106.mcz
-Versionner-Core-Model-TheIntegrator.56.mcz
-Versionner-Nautilus-TheIntegrator.2.mcz
-Versionner-Spec-Browser-TheIntegrator.211.mcz
+Versionner-Core-Model-PabloTesone.57.mcz
+Versionner-Nautilus-PavelKrivanek.1.mcz
+Versionner-Spec-Browser-PabloTesone.212.mcz
 Versionner-Tests-Core-Commands-MarcusDenker.21.mcz
 Versionner-Tests-Core-DependenciesModel-ChristopheDemarey.46.mcz
-Versionner-Tests-Core-Model-TheIntegrator.35.mcz
+Versionner-Tests-Core-Model-ChristopheDemarey.33.mcz
 Versionner-Tests-Resources-MarcusDenker.18.mcz
 WorldMenuHelp-TheIntegrator.2.mcz
 WriteBarrierTests-TheIntegrator.20.mcz

diff --git a/src/ScriptLoader60.package/ScriptLoader.class/instance/update60477.st b/src/ScriptLoader60.package/ScriptLoader.class/instance/update60477.st
diff --git a/src/ScriptLoader60.package/ScriptLoader.class/instance/update60479.st b/src/ScriptLoader60.package/ScriptLoader.class/instance/update60479.st
@@ -0,0 +1,13 @@
+pharo - updates
+update60479
+	"self new update60479"
+	self withUpdateLog: '20011 OSEnvironment>>getEnv: needs to use a primitive
+	https://pharo.fogbugz.com/f/cases/20011
+
+19936 The code presentation in the Meta tab cuts the scrollbar at the bottom
+	https://pharo.fogbugz.com/f/cases/19936
+
+19897 Problem with presentations containing tabulators in the inspector from the debugger
+	https://pharo.fogbugz.com/f/cases/19897'.
+	self loadTogether: self script60479 merge: false.
+	self flushCaches.
diff --git a/src/System-OSEnvironments.package/OSEnvironment.class/instance/getEnv..st b/src/System-OSEnvironments.package/OSEnvironment.class/instance/getEnv..st
@@ -1,4 +1,10 @@
-private
-getEnv: arg1
-	"This method calls the Standard C Library getenv() function. The name of the argument (arg1) should fit decompiled version."
-	 ^ self ffiCall: #( String getenv (String arg1) ) module: LibC
+accessing
+getEnv: varName
+	"This method calls the Standard C Library getenv() function."
+	"OSEnvironment current getEnv: 'HOME'"
+	<primitive: 'primitiveGetenv' module: '' error: ec>
+	ec ifNil: [ ^self getEnvViaFFI: varName ].
+	ec == #'bad argument' ifTrue: [
+		varName isString 
+			ifFalse: [ ^self getEnv: varName asString ] ].
+	self primitiveFail
diff --git a/src/System-OSEnvironments.package/OSEnvironment.class/instance/getEnvViaFFI..st b/src/System-OSEnvironments.package/OSEnvironment.class/instance/getEnvViaFFI..st
@@ -0,0 +1,4 @@
+private
+getEnvViaFFI: arg1
+	"This method calls the Standard C Library getenv() function. The name of the argument (arg1) should fit decompiled version."
+	 ^ self ffiCall: #( String getenv (String arg1) ) module: LibC
diff --git a/src/System-OSEnvironments.package/OSEnvironment.class/instance/unsetEnv..st b/src/System-OSEnvironments.package/OSEnvironment.class/instance/unsetEnv..st
@@ -1,4 +1,4 @@
-private
+accessing
 unsetEnv: string
 	"This method calls the Standard C Library getenv() function"
 	 ^ self ffiCall: #( int unsetenv (String string) ) module: LibC
diff --git a/...in32Environment.class/instance/getEnv..st → ...vironment.class/instance/getEnvViaFFI..st b/...in32Environment.class/instance/getEnv..st → ...vironment.class/instance/getEnvViaFFI..st
@@ -1,5 +1,5 @@
 private
-getEnv: aVariableName
+getEnvViaFFI: aVariableName
 	| valueSize buffer |
 	valueSize := self getEnvSize: aVariableName.
 	valueSize = 0 

diff --git a/src/System-OSEnvironments.package/Win32Environment.class/instance/unsetEnv..st b/src/System-OSEnvironments.package/Win32Environment.class/instance/unsetEnv..st
@@ -1,3 +1,3 @@
-private
+accessing
 unsetEnv: aString
 	^ self setEnv: aString value: nil
diff --git a/...est.package/DADependencyCheckerTest.class/instance/testShouldGetUnresolvedDependencies.st b/...est.package/DADependencyCheckerTest.class/instance/testShouldGetUnresolvedDependencies.st
@@ -7,6 +7,6 @@ testShouldGetUnresolvedDependencies
 	self 	
 		assert: result size
 		equals: 1.
-	self 
-		assertCollection: result
-		equals: { #collect:as: -> #(#'GT-Spotter' #'Collections-Abstract') asSet } asDictionary
+		
+	self assert: ((result at: #collect:as:) includesAllOf: #(#'GT-Spotter' #'Collections-Abstract')).
+