Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4941-Standalone-Glamour-and-GT #4943

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/BaselineOfCalypso/BaselineOfCalypso.class.st
Expand Up @@ -141,10 +141,6 @@ BaselineOfCalypso >> baseline: spec [
package: #'Calypso-SystemPlugins-DependencyAnalyser-Browser' with: [
spec requires: #(#'Calypso-SystemTools-Core' ) ];

package: #'Calypso-SystemPlugins-Spotter' with: [
spec requires: #(#'Calypso-SystemTools-FullBrowser' #'Calypso-SystemTools-QueryBrowser') ];


package: #'Calypso-Browser' with: [
spec requires: #(#'Calypso-NavigationModel' 'Commander' ). ];

Expand Down Expand Up @@ -178,7 +174,7 @@ BaselineOfCalypso >> baseline: spec [
group: 'MinimalEnvironment' with: #(#'Calypso-SystemQueries' #'Calypso-SystemPlugins-Traits-Queries' #'Calypso-SystemPlugins-Monticello-Queries' #'Calypso-SystemPlugins-SUnit-Queries' 'Calypso-SystemPlugins-InheritanceAnalysis-Queries' #'Calypso-SystemPlugins-FileOut-Queries' #'Calypso-SystemPlugins-Deprecation-Queries' #'Calypso-SystemPlugins-Undeclared-Queries' #'Calypso-SystemPlugins-FFI-Queries' #'Calypso-SystemPlugins-Flags-Queries' #'Calypso-SystemPlugins-ClassScripts-Queries');
group: 'FullEnvironment' with: #('MinimalEnvironment' #'Calypso-SystemPlugins-Reflectivity-Queries' #'Calypso-SystemPlugins-Critic-Queries' );

group: 'SystemBrowser' with: #(#'Calypso-SystemTools-FullBrowser' #'Calypso-SystemTools-QueryBrowser' #'Calypso-SystemPlugins-Traits-Browser' #'Calypso-SystemPlugins-Monticello-Browser' #'Calypso-SystemPlugins-SUnit-Browser' #'Calypso-SystemTools-OldToolCompatibillity' #'Calypso-SystemPlugins-Critic-Browser' 'Calypso-SystemPlugins-InheritanceAnalysis-Browser' #'Calypso-SystemPlugins-FileOut-Browser' #'Calypso-SystemPlugins-MethodDiffTool' #'Calypso-SystemPlugins-Deprecation-Browser' #'Calypso-SystemPlugins-Reflectivity-Browser' #'Calypso-SystemPlugins-Undeclared-Browser' #'Calypso-SystemPlugins-FFI-Browser' #'Calypso-SystemPlugins-Flags-Browser' #'Calypso-SystemPlugins-ClassScripts-Browser' #'Calypso-SystemPlugins-DependencyAnalyser-Browser' #'Calypso-SystemPlugins-Spotter');
group: 'SystemBrowser' with: #(#'Calypso-SystemTools-FullBrowser' #'Calypso-SystemTools-QueryBrowser' #'Calypso-SystemPlugins-Traits-Browser' #'Calypso-SystemPlugins-Monticello-Browser' #'Calypso-SystemPlugins-SUnit-Browser' #'Calypso-SystemTools-OldToolCompatibillity' #'Calypso-SystemPlugins-Critic-Browser' 'Calypso-SystemPlugins-InheritanceAnalysis-Browser' #'Calypso-SystemPlugins-FileOut-Browser' #'Calypso-SystemPlugins-MethodDiffTool' #'Calypso-SystemPlugins-Deprecation-Browser' #'Calypso-SystemPlugins-Reflectivity-Browser' #'Calypso-SystemPlugins-Undeclared-Browser' #'Calypso-SystemPlugins-FFI-Browser' #'Calypso-SystemPlugins-Flags-Browser' #'Calypso-SystemPlugins-ClassScripts-Browser' #'Calypso-SystemPlugins-DependencyAnalyser-Browser');

group: 'MinimalEnvironmentTests' with: #(#'Calypso-NavigationModel-Tests' #'Calypso-SystemQueries-Tests' #'Calypso-SystemPlugins-Traits-Queries-Tests' 'Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests' #'Calypso-SystemPlugins-Deprecation-Queries-Tests' #'Calypso-SystemPlugins-SUnit-Queries-Tests' #'Calypso-SystemPlugins-Undeclared-Queries-Tests' #'Calypso-SystemPlugins-FFI-Queries-Tests' #'Calypso-SystemPlugins-Flags-Queries-Tests' #'Calypso-SystemPlugins-ClassScripts-Queries-Tests');

Expand Down
23 changes: 6 additions & 17 deletions src/BaselineOfIDE/BaselineOfIDE.class.st
Expand Up @@ -36,19 +36,6 @@ Class {
{ #category : #actions }
BaselineOfIDE >> additionalInitialization [

self class environment at: #GTGenericStackDebugger ifPresent: [
Smalltalk tools register: GTGenericStackDebugger as: #debugger.
Smalltalk tools registeredDebuggersWithRanks.
Smalltalk tools debuggers add: ((self class environment at: #GTGenericStackDebugger)->3).
Smalltalk tools debuggers add: ((self class environment at: #GTSUnitDebugger)->70).
Smalltalk tools debuggers add: ((self class environment at: #GTBytecodeDebugger)->5).].


self class environment at: #GTPlayground ifPresent: [:playground |
Smalltalk tools register: playground as: #workspace.].
self class environment at: #GTInspector ifPresent: [:inspector |
Smalltalk tools register: inspector as: #inspector.].

Smalltalk tools register: ExternalChangesBrowser as: #changeList.
Smalltalk tools register: FileList as: #fileList.
Smalltalk tools register: Finder as: #finder.
Expand Down Expand Up @@ -146,10 +133,9 @@ BaselineOfIDE >> baseline: spec [
spec baseline: 'GeneralHelp' with: [ spec repository: repository ].
spec baseline: 'ReflectionMirrors' with: [ spec repository: repository ].
spec baseline: 'FuzzyMatcher' with: [ spec repository: repository ].
spec baseline: 'QAGT' with: [ spec repository: repository ].
spec baseline: 'QA' with: [ spec repository: repository ].
spec baseline: 'OSWindow' with: [ spec repository: repository ].
spec baseline: 'Refactoring' with: [ spec repository: repository ].
spec baseline: 'Catalog' with: [ spec repository: repository ].
spec baseline: 'Epicea' with: [ spec repository: repository ].
spec baseline: 'Misc' with: [ spec repository: repository ].
spec baseline: 'GeneralTests' with: [ spec repository: repository ].
Expand All @@ -167,6 +153,11 @@ BaselineOfIDE >> baseline: spec [
spec baseline: 'Calypso' with: [
spec repository: repository; loads: #('FullEnvironment' 'SystemBrowser' 'Tests'). ].
spec baseline: 'Ring' with: [spec repository: repository].

spec baseline: 'PharoGlamour' with: [ spec repository: repository ].
spec baseline: 'PharoGT' with: [ spec repository: repository ].
spec baseline: 'Catalog' with: [ spec repository: repository ].
spec package: 'Pharo-WelcomeHelp'.
].

]
Expand Down Expand Up @@ -215,8 +206,6 @@ BaselineOfIDE >> postload: loader package: packageSpec [

MCMethodDefinition initializersEnabled: initializersEnabled.

Smalltalk tools register: GTGenericStackDebugger as: #debugger.

Smalltalk cleanOutUndeclared.

Stdio stdout
Expand Down
30 changes: 27 additions & 3 deletions src/BaselineOfPharoGT/BaselineOfPharoGT.class.st
Expand Up @@ -13,6 +13,7 @@ BaselineOfPharoGT >> baseline: spec [
repository := self packageRepositoryURL.

spec for: #'common' do: [
spec postLoadDoIt: #'postload:package:'.

spec
package: 'OpalCompiler-Tools';
Expand All @@ -29,12 +30,35 @@ BaselineOfPharoGT >> baseline: spec [
package: 'GT-Tests-Debugger';
package: 'GT-Tests-Inspector';
package: 'GT-Tests-Playground';
package: 'GT-Tests-Spotter'.
package: 'GT-Tests-Spotter';
package: 'Calypso-SystemPlugins-Spotter'.

spec
group: 'Core' with: #('OpalCompiler-Tools' 'GT-Inspector' 'GT-InspectorExtensions-Core'
'GT-Playground' 'GT-EventRecorder' 'GT-Spotter' 'GT-Spotter-UI' 'GT-SpotterExtensions-Core'
'GT-Debugger' 'GT-BytecodeDebugger' 'GT-SUnitDebugger');
group: 'Tests' with: #('GT-Tests-Debugger' 'GT-Tests-Inspector' 'GT-Tests-Playground'
'GT-Debugger' 'GT-BytecodeDebugger' 'GT-SUnitDebugger' 'Calypso-SystemPlugins-Spotter');
group: 'Tests' with: #('GT-Tests-Debugger' 'GT-Tests-Inspector' 'GT-Tests-Playground'
'GT-Tests-Spotter');
group: 'default' with: #('Core' 'Tests') ]
]

{ #category : #baselines }
BaselineOfPharoGT >> postload: loader package: packageSpec [

Smalltalk tools register: GTGenericStackDebugger as: #debugger.

self class environment at: #GTGenericStackDebugger ifPresent: [
Smalltalk tools register: GTGenericStackDebugger as: #debugger.
Smalltalk tools registeredDebuggersWithRanks.
Smalltalk tools debuggers add: ((self class environment at: #GTGenericStackDebugger)->3).
Smalltalk tools debuggers add: ((self class environment at: #GTSUnitDebugger)->70).
Smalltalk tools debuggers add: ((self class environment at: #GTBytecodeDebugger)->5).].


self class environment at: #GTPlayground ifPresent: [:playground |
Smalltalk tools register: playground as: #workspace.].
self class environment at: #GTInspector ifPresent: [:inspector |
Smalltalk tools register: inspector as: #inspector.].


]
@@ -1,21 +1,18 @@
Class {
#name : #BaselineOfQAGT,
#name : #BaselineOfQA,
#superclass : #BaselineOf,
#category : #BaselineOfQAGT
#category : #BaselineOfQA
}

{ #category : #baselines }
BaselineOfQAGT >> baseline: spec [
BaselineOfQA >> baseline: spec [
<baseline>

| repository |

repository := self packageRepositoryURL.

spec for: #'common' do: [
spec baseline: 'PharoGlamour' with: [ spec repository: repository ].
spec baseline: 'PharoGT' with: [ spec repository: repository ].

spec package: 'NautilusRefactoring'.

spec baseline: 'SmartSuggestions' with: [ spec repository: repository ].
Expand Down
1 change: 1 addition & 0 deletions src/BaselineOfQA/package.st
@@ -0,0 +1 @@
Package { #name : #BaselineOfQA }
1 change: 0 additions & 1 deletion src/BaselineOfQAGT/package.st

This file was deleted.

10 changes: 10 additions & 0 deletions src/GT-Inspector/ClassDescription.extension.st
@@ -0,0 +1,10 @@
Extension { #name : #ClassDescription }

{ #category : #'*GT-Inspector' }
ClassDescription >> glmCritiqueSourceIn: composite [

^ composite pharoScript
title: 'Source';
display: [ self definition ];
act: [ self browse ] icon: GLMUIThemeExtraIcons glamorousBrowse entitled: 'Browse'
]
5 changes: 5 additions & 0 deletions src/GT-Inspector/Object.extension.st
Expand Up @@ -75,3 +75,8 @@ Object >> gtInspectorVariableValuePairs [
self gtInspectorVariableNodesIn: bindings.
^ bindings collect: [ :aNode | aNode key -> aNode value ]
]

{ #category : #'*GT-Inspector' }
Object >> inspectInExternalWindow [
^ GTInspector new openInExternalWindowOn: self
]
19 changes: 19 additions & 0 deletions src/GT-Inspector/ReAbstractCritique.extension.st
@@ -0,0 +1,19 @@
Extension { #name : #ReAbstractCritique }

{ #category : #'*GT-Inspector' }
ReAbstractCritique >> gtInspectorDescriptionIn: composite [
<gtInspectorPresentationOrder: 1>

^ composite text
title: 'Description';
display: [ self description ]
]

{ #category : #'*GT-Inspector' }
ReAbstractCritique >> gtInspectorSourceCodeIn: composite [
<gtInspectorPresentationOrder: 0>

sourceAnchor gtInspectorAnchorIn: composite


]
9 changes: 9 additions & 0 deletions src/GT-Inspector/ReIntervalSourceAnchor.extension.st
@@ -0,0 +1,9 @@
Extension { #name : #ReIntervalSourceAnchor }

{ #category : #'*GT-Inspector' }
ReIntervalSourceAnchor >> gtInspectorAnchorIn: composite [
<gtInspectorPresentationOrder: 0>

(super gtInspectorAnchorIn: composite)
initialize: [ :p | p selectionInterval: interval ]
]
12 changes: 12 additions & 0 deletions src/GT-Inspector/ReProperty.extension.st
@@ -0,0 +1,12 @@
Extension { #name : #ReProperty }

{ #category : #'*GT-Inspector' }
ReProperty >> gtInspectorActions [
^ (self actions collect: [ :act |
GLMGenericAction new
action: [ act actOnCritic: self ofEntity: self sourceAnchor entity ];
icon: act icon;
title: act description;
yourself ]),
super gtInspectorActions
]
9 changes: 9 additions & 0 deletions src/GT-Inspector/ReSearchStringSourceAnchor.extension.st
@@ -0,0 +1,9 @@
Extension { #name : #ReSearchStringSourceAnchor }

{ #category : #'*GT-Inspector' }
ReSearchStringSourceAnchor >> gtInspectorAnchorIn: composite [
<gtInspectorPresentationOrder: 0>

(super gtInspectorAnchorIn: composite)
initialize: [ :p | p selectionInterval: self interval ]
]
8 changes: 8 additions & 0 deletions src/GT-Inspector/ReSourceAnchor.extension.st
@@ -0,0 +1,8 @@
Extension { #name : #ReSourceAnchor }

{ #category : #'*GT-Inspector' }
ReSourceAnchor >> gtInspectorAnchorIn: composite [
<gtInspectorPresentationOrder: 0>

^ sourceEntity glmCritiqueSourceIn: composite
]
12 changes: 12 additions & 0 deletions src/GT-Spotter/GTSpotterExtensionSettings.class.st
Expand Up @@ -14,6 +14,18 @@ Class {
#category : #'GT-Spotter-Model'
}

{ #category : #Renraku }
GTSpotterExtensionSettings class >> Object_spotterRePropertiesFor [

^ ReSettings spotterPlugin
]

{ #category : #Renraku }
GTSpotterExtensionSettings class >> Object_spotterRePropertiesFor: aBoolean [

^ ReSettings spotterPlugin: aBoolean
]

{ #category : #settings }
GTSpotterExtensionSettings class >> catalogSettingsOn: aBuilder [
<systemsettings>
Expand Down
14 changes: 14 additions & 0 deletions src/GT-Spotter/Object.extension.st
Expand Up @@ -110,3 +110,17 @@ Object >> spotterProcessorsFor: aSpotterStep pragma: aPragma [
do: [ ('[Spotter] Exception while collecting processors for <'
, self class name , '>: ' , exception asString) traceCr ] ]
]

{ #category : #'*GT-Spotter' }
Object >> spotterRePropertiesFor: aStep [
<spotterOrder: 0>

ReSettings spotterPlugin ifFalse: [ ^ self ].

aStep listProcessor
title: 'Renraku Properties';
items: [ self externalProperties asArray ];
itemName: #title;
itemIcon: #icon;
filter: GTFilterSubstring
]
10 changes: 10 additions & 0 deletions src/GT-Spotter/ReAbstractCritique.extension.st
@@ -0,0 +1,10 @@
Extension { #name : #ReAbstractCritique }

{ #category : #'*GT-Spotter' }
ReAbstractCritique >> spotterPreviewRationaleIn: aComposite [
<spotterPreview: 5>
aComposite text
title: [ self title ];
display: [ self description ];
entity: self
]
22 changes: 22 additions & 0 deletions src/Glamour-Core/GLMCompositePresentation.class.st
Expand Up @@ -190,6 +190,21 @@ GLMCompositePresentation >> open [
^self openWith: self defaultRenderer
]

{ #category : #OSWindow }
GLMCompositePresentation >> openInExternalWindow [
^ self defaultRenderer openInExternalWindow: self
]

{ #category : #OSWindow }
GLMCompositePresentation >> openInExternalWindowOn: anObject [
^ self openOn: anObject inExternalWindowWith: self defaultRenderer
]

{ #category : #OSWindow }
GLMCompositePresentation >> openInExternalWindowWith: aRenderer [
^ aRenderer openInExternalWindow: self
]

{ #category : #'scripting opening' }
GLMCompositePresentation >> openOn: anObject [

Expand All @@ -198,6 +213,13 @@ GLMCompositePresentation >> openOn: anObject [
with: self defaultRenderer
]

{ #category : #OSWindow }
GLMCompositePresentation >> openOn: anObject inExternalWindowWith: aRenderer [

self startOn: anObject.
^ aRenderer openInExternalWindow: self
]

{ #category : #'scripting opening' }
GLMCompositePresentation >> openOn: anObject with: aRenderer [

Expand Down
6 changes: 6 additions & 0 deletions src/Glamour-Morphic-Renderer/GLMMorphicRenderer.class.st
Expand Up @@ -25,6 +25,12 @@ GLMMorphicRenderer >> open: aRenderable [
^ window openInWorld
]

{ #category : #OSWindow }
GLMMorphicRenderer >> openInExternalWindow: aRenderable [
window := GLMOSWindowMorphWorldRenderer render: aRenderable from: self.
^ window open
]

{ #category : #'rendering presentations' }
GLMMorphicRenderer >> renderAccordionCompositePresentation: aCompositePresentation [
^ GLMMorphicAccordionRenderer render: aCompositePresentation from: self
Expand Down
Expand Up @@ -7,7 +7,7 @@ Class {
#instVars : [
'window'
],
#category : #'OSWindow-Core-Morphic'
#category : #'Glamour-Morphic-Renderer'
}

{ #category : #rendering }
Expand Down
Expand Up @@ -116,6 +116,12 @@ GLMRubricSmalltalkTextModel >> shoutAboutToStyle: aPluggableShoutMorph [
^ true
]

{ #category : #'smartSuggestions - support' }
GLMRubricSmalltalkTextModel >> sugsContext [

^ SugsGlamourCodeContext model: self
]

{ #category : #bindings }
GLMRubricSmalltalkTextModel >> variableBindings [
^ variableBindings ifNil: [variableBindings := Dictionary new]
Expand Down
23 changes: 0 additions & 23 deletions src/OSWindow-Core/GLMCompositePresentation.extension.st

This file was deleted.

7 changes: 0 additions & 7 deletions src/OSWindow-Core/GLMMorphicRenderer.extension.st

This file was deleted.

6 changes: 0 additions & 6 deletions src/OSWindow-Core/Object.extension.st

This file was deleted.

Expand Up @@ -5,7 +5,7 @@ I pass through basic concepts to getting started with Pharo.
Class {
#name : #WelcomeHelp,
#superclass : #CustomHelp,
#category : #'Pharo-Help'
#category : #'Pharo-WelcomeHelp'
}

{ #category : #accessing }
Expand Down
1 change: 1 addition & 0 deletions src/Pharo-WelcomeHelp/package.st
@@ -0,0 +1 @@
Package { #name : #'Pharo-WelcomeHelp' }