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.

Sign up for GitHub

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

Jump to bottom

Refactor textstructure #118

Merged
merged 13 commits into from
Jul 3, 2020
Merged

Refactor textstructure #118

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d229b48
Modify TextStructure to hold a Collection of TextAttributes
Jun 18, 2020
5fa6c59
Application of structures somewhat working
Jun 18, 2020
9e31d0d
Everything except Font and Color seems to work
Jun 18, 2020
7f2f0f6
Add font and color support
Jun 18, 2020
69bdfc8
Adjust tests to new TextStructure and improve it
Jun 19, 2020
2af808c
Not extendable attributes work now and text can be made a clickable h…
Jun 19, 2020
a7fefec
Rename methods with formerly confusing names
Jun 19, 2020
77695bb
Minor improvements (mainly in naming)
Jun 21, 2020
5d68808
Remove distinction between attribute and structure in method names
Jun 21, 2020
52541d4
Improve naming for TextStructure instance creation and something with…
Jun 21, 2020
233f94b
Merge branch 'dev' into refactor-textstructure
frcroth Jul 2, 2020
4ce5a51
Minor improvements
Jun 25, 2020
ce492c5
Fix pasted urls not working
frcroth Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added packages/RichTextEditing-Core.package/ExtendableText.class/README.md
View file
Open in desktop
Empty file.
4 changes: 4 additions & 0 deletions packages/RichTextEditing-Core.package/ExtendableText.class/instance/mayBeExtended.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
as yet unclassified
konradh marked this conversation as resolved.
Show resolved Hide resolved
mayBeExtended

^ true
5 changes: 5 additions & 0 deletions packages/RichTextEditing-Core.package/ExtendableText.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"class" : {
},
"instance" : {
"mayBeExtended" : "kh 6/18/2020 16:48" } }
19 changes: 19 additions & 0 deletions packages/RichTextEditing-Core.package/ExtendableText.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"category" : "RichTextEditing-Core",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
"structureIdentifier",
"color",
"font",
"styleSet",
"stylesActivated",
"attributes" ],
"name" : "ExtendableText",
"pools" : [
],
"super" : "TextAttribute",
"type" : "normal" }
2 changes: 2 additions & 0 deletions packages/RichTextEditing-Core.package/NullTextStructure.class/instance/add..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
adding
add: aTextAttribute
4 changes: 4 additions & 0 deletions packages/RichTextEditing-Core.package/NullTextStructure.class/instance/at.ifAbsent..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
at: aSymbol ifAbsent: aBlock

^ NullTextStructure new
4 changes: 4 additions & 0 deletions packages/RichTextEditing-Core.package/NullTextStructure.class/instance/includes..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
testing
includes: aTextAttribute

^ false
2 changes: 2 additions & 0 deletions packages/RichTextEditing-Core.package/NullTextStructure.class/instance/remove..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
removing
remove: aTextAttribute
2 changes: 2 additions & 0 deletions ...ges/RichTextEditing-Core.package/NullTextStructure.class/instance/structureIdentifier..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
accessing
structureIdentifier: aSymbol
7 changes: 6 additions & 1 deletion packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@
"class" : {
"warningText" : "tok 6/12/2020 12:41" },
"instance" : {
"add:" : "kh 6/18/2020 21:24",
"at:ifAbsent:" : "kh 6/18/2020 21:25",
"includes:" : "kh 6/18/2020 21:25",
"noCurrentStructureWarning" : "tok 6/12/2020 12:41",
"openColorPicker" : "ls 7/24/2019 21:54",
"openFontChooser" : "ls 7/24/2019 21:22",
"remove:" : "kh 6/18/2020 21:24",
"resetColor" : "ls 7/24/2019 21:57",
"resetFont" : "ls 7/24/2019 21:23",
"structureIdentifier" : "ls 7/24/2019 22:17" } }
"structureIdentifier" : "ls 7/24/2019 22:17",
"structureIdentifier:" : "kh 6/18/2020 21:57" } }
5 changes: 4 additions & 1 deletion packages/RichTextEditing-Core.package/RichTextDocument.class/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ I am a RichTextDocument. I represent the text someone wrote in order to improve

I am independent from the RichTextEditorModel, as the textStructures as well as my name and my text can be manipulated directly, so the RichTextEditorModel is not always needed, even though it can always be used.

You can add a new structure to the structures available in new instances of me by adding a new TextStructure to my initialTextStructures method on class side.

My instance variables are:
name - aString
text - aText
textStructures - anOrderedCollection
textStructures - anOrderedCollection
timeLastSaved - aDateAndTime

4 changes: 4 additions & 0 deletions packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
constants
commonStyles

^ {TextStructure extendable} asSet
2 changes: 1 addition & 1 deletion packages/RichTextEditing-Core.package/RichTextDocument.class/class/defaultStyles.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
constants
defaultStyles

^ {TextStructure extendableStyle} asSet
^ self commonStyles
konradh marked this conversation as resolved.
Show resolved Hide resolved
10 changes: 5 additions & 5 deletions packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
constants
initial structures
initialBoldStructure

^ TextStructure
newWith: #bold
withStyles: (self defaultStyles union: {TextStructure boldStyle})
^ TextStructure
new: #bold
with: (self commonStyles union: {TextStructure bold})
11 changes: 5 additions & 6 deletions ...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
constants
initial structures
initialFootnoteStructure

^ (TextStructure
newWith: #footnote
withStyles: self defaultStyles)
font: (StrikeFont createDejaVuDark: 9)

^ TextStructure
new: #footnote
with: (self commonStyles union: {TextStructure font: (StrikeFont createDejaVuDark: 9)})
13 changes: 7 additions & 6 deletions ...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
constants
initial structures
initialHeading1Structure

^ (TextStructure
newWith: #heading1
withStyles: (self defaultStyles union: {TextStructure boldStyle}))
font: (StrikeFont createDejaVuDark: 20)

^ TextStructure
new: #heading1
with: (self commonStyles union:
{TextStructure font: (StrikeFont createDejaVuDark: 20).
TextStructure bold})
13 changes: 7 additions & 6 deletions ...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
constants
initial structures
initialHeading2Structure

^ (TextStructure
newWith: #heading2
withStyles: (self defaultStyles union: {TextStructure boldStyle}))
font: (StrikeFont createDejaVuDark: 17)

^ TextStructure
new: #heading2
with: (self commonStyles union:
{TextStructure font: (StrikeFont createDejaVuDark: 17).
TextStructure bold})
13 changes: 7 additions & 6 deletions ...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
constants
initial structures
initialHeading3Structure

^ (TextStructure
newWith: #heading3
withStyles: (self defaultStyles union: {TextStructure boldStyle}))
font: (StrikeFont createDejaVuDark: 14)

^ TextStructure
new: #heading3
with: (self commonStyles union:
{TextStructure font: (StrikeFont createDejaVuDark: 14).
TextStructure bold})
6 changes: 3 additions & 3 deletions packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
constants
initial structures
initialItalicStructure

^ TextStructure
newWith: #italic
withStyles: (self defaultStyles union: {TextStructure italicStyle})
new: #italic
with: (self commonStyles union: {TextStructure italic})
8 changes: 4 additions & 4 deletions packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
constants
initial structures
initialListStructure

^ TextStructure
newWith: #list
withStyles: (self defaultStyles union: {TextStructure indentedStyle})
new: #list
with: (self commonStyles union: {TextStructure indented})
4 changes: 2 additions & 2 deletions packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
constants
initial structures
initialTextStructures

^ {self initialBoldStructure.
self initialItalicStructure.
self initialUnderlinedStructure.
self initialFootnoteStructure.
self initialHeading1Structure.
self initialHeading2Structure.
self initialHeading3Structure.
self initialFootnoteStructure.
self initialListStructure} asOrderedCollection
10 changes: 5 additions & 5 deletions ...s/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
constants
initial structures
initialUnderlinedStructure

^ TextStructure
newWith: #underlined
withStyles: (self defaultStyles union: {TextStructure underlinedStyle})
^ TextStructure
new: #underlined
with: (self commonStyles union: {TextStructure underlined})
5 changes: 5 additions & 0 deletions packages/RichTextEditing-Core.package/RichTextDocument.class/instance/getTextStructure..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
text structures
getTextStructure: aSymbol
konradh marked this conversation as resolved.
Show resolved Hide resolved

^ self textStructures detect: [:each | each structureIdentifier = aSymbol]
ifNone: [^ NullTextStructure new]
3 changes: 2 additions & 1 deletion ...ages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
text structures
initializeStructure: aSymbol

self initializeStructure: aSymbol withEmphasis: self class defaultStyles
"self initializeStructure: aSymbol withEmphasis: self class defaultStyles"
konradh marked this conversation as resolved.
Show resolved Hide resolved
self textStructures add: (TextStructure new: aSymbol with: self class defaultStyles)
2 changes: 1 addition & 1 deletion packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
text structures
removeStructure: aSymbol

self textStructures remove: (self symbolToStructure: aSymbol).
self textStructures remove: (self symbolToStructure: aSymbol) ifAbsent: [].
konradh marked this conversation as resolved.
Show resolved Hide resolved
self
textChanged;
structuresChanged
26 changes: 14 additions & 12 deletions packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
{
"class" : {
"defaultStyles" : "tok 6/8/2020 12:21",
"commonStyles" : "kh 6/18/2020 21:39",
"defaultStyles" : "kh 6/18/2020 22:35",
"editorClass" : "ls 6/26/2019 17:33",
"fromText:withStructures:" : "ls 6/26/2019 17:31",
"initialBoldStructure" : "tok 6/8/2020 12:22",
"initialFootnoteStructure" : "tok 6/8/2020 12:06",
"initialHeading1Structure" : "tok 6/8/2020 12:22",
"initialHeading2Structure" : "tok 6/8/2020 12:22",
"initialHeading3Structure" : "tok 6/8/2020 12:22",
"initialItalicStructure" : "tok 6/8/2020 12:22",
"initialListStructure" : "tok 6/8/2020 12:22",
"initialTextStructures" : "tok 5/31/2020 21:15",
"initialUnderlinedStructure" : "tok 6/8/2020 12:23" },
"initialBoldStructure" : "kh 6/19/2020 00:28",
"initialFootnoteStructure" : "kh 6/19/2020 00:29",
"initialHeading1Structure" : "kh 6/19/2020 00:30",
"initialHeading2Structure" : "kh 6/19/2020 00:31",
"initialHeading3Structure" : "kh 6/19/2020 00:31",
"initialItalicStructure" : "kh 6/19/2020 00:28",
"initialListStructure" : "kh 6/19/2020 00:32",
"initialTextStructures" : "kh 6/19/2020 00:34",
"initialUnderlinedStructure" : "kh 6/18/2020 21:39" },
"instance" : {
"addAttribute:from:to:" : "AG 7/25/2019 13:08",
"charcount" : "frc 5/25/2020 16:02",
"charcountExcept:" : "frc 6/13/2020 11:15",
"copy:" : "MB 7/3/2019 18:58",
"createNewStructure:" : "ls 7/24/2019 15:24",
"emptyChars" : "frc 6/1/2020 13:43",
"getTextStructure:" : "kh 6/18/2020 21:18",
"hasStructure:forText:from:to:" : "AG 7/25/2019 13:20",
"initialize" : "ls 7/24/2019 15:10",
"initializeStructure:" : "ls 7/24/2019 15:13",
"initializeStructure:" : "kh 6/18/2020 22:37",
"initializeStructure:withEmphasis:" : "tok 6/8/2020 12:06",
"initializeStructures" : "ls 7/24/2019 15:12",
"isUnsavedDocument" : "OS 6/14/2020 18:19",
"name" : "ls 6/26/2019 17:28",
"name:" : "MB 7/3/2019 19:29",
"openEditor" : "lh 7/24/2019 21:27",
"openInEditor" : "ls 7/24/2019 20:14",
"removeStructure:" : "ls 7/24/2019 17:28",
"removeStructure:" : "kh 6/18/2020 22:49",
"removeTextAttribute:from:to:" : "MB 7/24/2019 20:40",
"sortRunsByPriority" : "JEH 5/20/2020 10:28",
"structuresChanged" : "ls 7/24/2019 14:46",
Expand Down
2 changes: 1 addition & 1 deletion packages/RichTextEditing-Core.package/RichTextDocument.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
],
"classvars" : [
],
"commentStamp" : "lh 7/25/2019 11:57",
"commentStamp" : "kh 6/19/2020 00:40",
"instvars" : [
"textStructures",
"text",
Expand Down
2 changes: 1 addition & 1 deletion ...ichTextEditing-Core.package/RichTextEditorModel.class/instance/addExtendableStructures.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ addExtendableStructures

(self currentStructures
collect: [:each | self symbolToStructure: each]
thenSelect: [:each | each isExtendable]) do: [:each | self addAttribute: each]
thenSelect: [:each | each mayBeExtended]) do: [:each | self addAttribute: each]
2 changes: 1 addition & 1 deletion packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"yellowButtonMenuItems" : "tok 5/31/2020 20:54" },
"instance" : {
"addAttribute:" : "ls 7/24/2019 20:26",
"addExtendableStructures" : "OS 5/31/2020 23:59",
"addExtendableStructures" : "kh 6/19/2020 00:51",
"applyCurrentStructures" : "OS 6/3/2020 22:35",
"bufferDocument" : "ls 6/26/2019 17:45",
"bufferDocument:" : "ls 7/24/2019 20:57",
Expand Down
5 changes: 5 additions & 0 deletions packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
constants
allAttributes

^ TextStructure allAttributeIdentifiers

konradh marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 0 additions & 5 deletions packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/textStyles.st
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
text coloring
addColor: aColor

self currentStructure add: (TextStructure color: aColor)
4 changes: 0 additions & 4 deletions packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor.st
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
text font
addFont: aFont

self currentStructure add: (TextStructure font: aFont)


6 changes: 0 additions & 6 deletions packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont.st
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions ...ages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributes.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
text attributes
allAttributes

^ self class allAttributes
2 changes: 1 addition & 1 deletion ...hTextEditing-Core.package/RichTextStructureEditor.class/instance/buildColorButtonWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildColorButtonWith: aBuilder
model: self;
frame: (0.5 @ 0.55 corner: 0.75 @ 0.65);
label: 'Color';
action: #addColor;
action: #openColorPicker;
yourself


Loading