editors: use EDITOR: to register editors.

loading an EDITOR: does not set it as your editor; calling SET-EDITOR: does this.

"editors.ui" run ! will also set/change your editor

Recommended editor setup:

scaffold-factor-boot-rc

USE: editors
SET-EDITOR: visual-studio-code

diff --git a/basis/editors/10x/10x.factor b/basis/editors/10x/10x.factor
index ba16b082d0b07e4ee97994760d1dfd7fc3c637c8..dd13ba3a4814a39fd309f083a338b75eef9ab66b 100644 (file)
--- a/basis/editors/10x/10x.factor
+++ b/basis/editors/10x/10x.factor
@@ -4,9 +4,7 @@ USING: editors io.standard-paths kernel make math math.parser
 namespaces sequences system ;
 IN: editors.10x
 
-SINGLETON: 10x-editor
-
-editor-class [ 10x-editor ] initialize
+EDITOR: 10x-editor
 
 SYMBOL: 10x-editor-path
 

diff --git a/basis/editors/acme/acme.factor b/basis/editors/acme/acme.factor
index da841431272801b0c3be7253ff9dcb08d8a19274..ba06a2324845b3ece03cb12f49c6f844e415a362 100644 (file)
--- a/basis/editors/acme/acme.factor
+++ b/basis/editors/acme/acme.factor
@@ -4,9 +4,7 @@ USING: arrays editors environment io.files.info io.pathnames
 kernel make math.parser namespaces sequences ;
 IN: editors.acme
 
-SINGLETON: acme
-
-editor-class [ acme ] initialize
+EDITOR: acme
 
 : plan9-path ( -- path )
   \ plan9-path get [

diff --git a/basis/editors/aquamacs/aquamacs.factor b/basis/editors/aquamacs/aquamacs.factor
index b208d0261f68866741b9f81c62611330c5b182d1..72b11bfb3e5ef0fdb4012acf4e8464ae9a0c641b 100644 (file)
--- a/basis/editors/aquamacs/aquamacs.factor
+++ b/basis/editors/aquamacs/aquamacs.factor
@@ -8,9 +8,7 @@ USING: editors io.pathnames io.standard-paths kernel make
 math.parser namespaces sequences system ;
 IN: editors.aquamacs
 
-SINGLETON: aquamacs
-
-editor-class [ aquamacs ] initialize
+EDITOR: aquamacs
 
 HOOK: find-aquamacs-path os ( -- path )
 

diff --git a/basis/editors/atom/atom.factor b/basis/editors/atom/atom.factor
index ef11b6c51ec4af4c9f9410b5f6279838ee234932..d32df3d3bb925f003c9c5aaba48eabd123dc4757 100644 (file)
--- a/basis/editors/atom/atom.factor
+++ b/basis/editors/atom/atom.factor
@@ -4,9 +4,7 @@ USING: editors io.pathnames io.standard-paths kernel make
 math.parser namespaces sequences system ;
 IN: editors.atom
 
-SINGLETON: atom
-
-editor-class [ atom ] initialize
+EDITOR: atom
 
 SYMBOL: atom-path
 

diff --git a/basis/editors/bbedit/bbedit.factor b/basis/editors/bbedit/bbedit.factor
index 8de2b9d555d90dcc6d5e14ad62d6afad5f7cd0cb..52936c30c6ec52afc5c1a072214288347356341e 100644 (file)
--- a/basis/editors/bbedit/bbedit.factor
+++ b/basis/editors/bbedit/bbedit.factor
@@ -1,9 +1,7 @@
 USING: editors kernel make namespaces ;
 IN: editors.bbedit
 
-SINGLETON: bbedit
-
-editor-class [ bbedit ] initialize
+EDITOR: bbedit
 
 M: bbedit editor-command
     drop

diff --git a/basis/editors/bluefish/bluefish.factor b/basis/editors/bluefish/bluefish.factor
index 29d8b85a2890627b490a025e83d6811e861bb8bb..f44d79b0e3f16e473c651f210dcba2b4aaf1fb7f 100644 (file)
--- a/basis/editors/bluefish/bluefish.factor
+++ b/basis/editors/bluefish/bluefish.factor
@@ -1,9 +1,7 @@
 USING: editors kernel make namespaces ;
 IN: editors.bluefish
 
-SINGLETON: bluefish
-
-editor-class [ bluefish ] initialize
+EDITOR: bluefish
 
 M: bluefish editor-command
     drop

diff --git a/basis/editors/brackets/brackets.factor b/basis/editors/brackets/brackets.factor
index 214ab1d15186b07b27fc00e97571a39ddd13fad4..22ea37e47953e5eb2b60b310cca76991d40c4a7e 100644 (file)
--- a/basis/editors/brackets/brackets.factor
+++ b/basis/editors/brackets/brackets.factor
@@ -4,9 +4,7 @@ USING: editors io.pathnames io.standard-paths kernel make
 namespaces system vocabs ;
 IN: editors.brackets
 
-SINGLETON: brackets
-
-editor-class [ brackets ] initialize
+EDITOR: brackets
 
 HOOK: brackets-path os ( -- path )
 

diff --git a/basis/editors/coteditor/coteditor.factor b/basis/editors/coteditor/coteditor.factor
index 241bdc98b1031cb0f70f0e3780126f385b721c70..1d18ac30b5cd57ee21c931a2f6dc4c962f1d8953 100644 (file)
--- a/basis/editors/coteditor/coteditor.factor
+++ b/basis/editors/coteditor/coteditor.factor
@@ -2,9 +2,7 @@ USING: editors io.pathnames io.standard-paths kernel make
 math.parser namespaces ;
 IN: editors.coteditor
 
-SINGLETON: coteditor
-
-editor-class [ coteditor ] initialize
+EDITOR: coteditor
 
 : find-cot-bundle-path ( -- path/f )
     "com.coteditor.CotEditor" find-native-bundle [

diff --git a/basis/editors/cudatext/cudatext.factor b/basis/editors/cudatext/cudatext.factor
index 0868004432b2dab31224f407a40be8d990f4217a..abacab6922656c7fe7fa7394c953c0d4e33f7c39 100644 (file)
--- a/basis/editors/cudatext/cudatext.factor
+++ b/basis/editors/cudatext/cudatext.factor
@@ -3,9 +3,7 @@ math.parser namespaces sequences system ;
 
 IN: editors.cudatext
 
-SINGLETON: cudatext
-
-editor-class [ cudatext ] initialize
+EDITOR: cudatext
 
 HOOK: find-cudatext-path os ( -- path )
 

diff --git a/basis/editors/editors.factor b/basis/editors/editors.factor
index e69eb567a3561e3274f85fc3a12b0aec55840a6b..df2a97a8aed6705c3a88a878a4d463a5d0b303cb 100644 (file)
--- a/basis/editors/editors.factor
+++ b/basis/editors/editors.factor
@@ -24,7 +24,7 @@ SYNTAX: EDITOR:
     scan-new-class [ define-singleton-class ] [ editors get-global adjoin ] bi ;
 
 SYNTAX: SET-EDITOR:
-    scan-token [ "editors." prepend require ] [ search ] bi editor-class set-global ;
+    scan-token [ "editors." prepend use-vocab ] [ search ] bi editor-class set-global ;
 
 HOOK: editor-command editor-class ( file line -- command )
 

diff --git a/basis/editors/editpadlite/editpadlite.factor b/basis/editors/editpadlite/editpadlite.factor
index 9575b6e78bc75d3cefd74f12e9ae27e7e99bae08..14e4fba9be90d52ea257fb77dc8658a13db63bb9 100644 (file)
--- a/basis/editors/editpadlite/editpadlite.factor
+++ b/basis/editors/editpadlite/editpadlite.factor
@@ -2,9 +2,7 @@ USING: combinators.short-circuit editors io.standard-paths
 kernel make namespaces ;
 IN: editors.editpadlite
 
-SINGLETON: editpadlite
-
-editor-class [ editpadlite ] initialize
+EDITOR: editpadlite
 
 : editpadlite-path ( -- path )
     \ editpadlite-path get [

diff --git a/basis/editors/editpadpro/editpadpro.factor b/basis/editors/editpadpro/editpadpro.factor
index 4ce9aaca843d4abdfcfff0760305f48b609a5222..0bf56dc0a38766fe292113069aa6937b30db900d 100644 (file)
--- a/basis/editors/editpadpro/editpadpro.factor
+++ b/basis/editors/editpadpro/editpadpro.factor
@@ -2,9 +2,7 @@ USING: combinators.short-circuit editors io.standard-paths
 kernel make math.parser namespaces sequences ;
 IN: editors.editpadpro
 
-SINGLETON: editpadpro
-
-editor-class [ editpadpro ] initialize
+EDITOR: editpadpro
 
 : editpadpro-path ( -- path )
     \ editpadpro-path get [

diff --git a/basis/editors/editplus/editplus.factor b/basis/editors/editplus/editplus.factor
index 8c38eee1857d0dea6d1dcf568d1dac4b9a37aa35..2904e9d7a3a2af47ac059201f7a66d2c627b2b02 100644 (file)
--- a/basis/editors/editplus/editplus.factor
+++ b/basis/editors/editplus/editplus.factor
@@ -2,9 +2,7 @@ USING: editors io.standard-paths kernel make math.parser
 namespaces ;
 IN: editors.editplus
 
-SINGLETON: editplus
-
-editor-class [ editplus ] initialize
+EDITOR: editplus
 
 : editplus-path ( -- path )
     \ editplus-path get [

diff --git a/basis/editors/emacs/emacs.factor b/basis/editors/emacs/emacs.factor
index 9ce457a43a11f5d6eb5fe531f2a2093f5cbbcb83..dbfebd703b1c312f4f20ca75794cbbcb810aecde 100644 (file)
--- a/basis/editors/emacs/emacs.factor
+++ b/basis/editors/emacs/emacs.factor
@@ -2,9 +2,7 @@ USING: combinators.short-circuit editors io.standard-paths
 kernel make math.parser namespaces sequences system vocabs ;
 IN: editors.emacs
 
-SINGLETON: emacs
-
-editor-class [ emacs ] initialize
+EDITOR: emacs
 
 SYMBOL: emacsclient-path
 SYMBOL: emacsclient-args

diff --git a/basis/editors/emeditor/emeditor.factor b/basis/editors/emeditor/emeditor.factor
index deb916bc26c2f204f624ee4ac63e67b63f05dcde..7a006a9eb08fafe9e713b47eed6fce0057baaf45 100644 (file)
--- a/basis/editors/emeditor/emeditor.factor
+++ b/basis/editors/emeditor/emeditor.factor
@@ -2,9 +2,7 @@ USING: editors io.standard-paths kernel make math.parser
 namespaces ;
 IN: editors.emeditor
 
-SINGLETON: emeditor
-
-editor-class [ emeditor ] initialize
+EDITOR: emeditor
 
 : emeditor-path ( -- path )
     \ emeditor-path get [

diff --git a/basis/editors/espresso/espresso.factor b/basis/editors/espresso/espresso.factor
index 8334fd016d163aebebf62dee48d2230be0fa7ad0..2302e010f0979a4f1fc10b0bf41eef75427f9c64 100644 (file)
--- a/basis/editors/espresso/espresso.factor
+++ b/basis/editors/espresso/espresso.factor
@@ -2,9 +2,7 @@ USING: editors kernel make namespaces ;
 
 IN: editors.espresso
 
-SINGLETON: espresso
-
-editor-class [ espresso ] initialize
+EDITOR: espresso
 
 M: espresso editor-command
     drop

diff --git a/basis/editors/etexteditor/etexteditor.factor b/basis/editors/etexteditor/etexteditor.factor
index b4d3fc9232bd7d50992d7ea10f410fb87f8559c0..a6d6489e35a313faab3e090b3bec18ae821db2c5 100644 (file)
--- a/basis/editors/etexteditor/etexteditor.factor
+++ b/basis/editors/etexteditor/etexteditor.factor
@@ -4,9 +4,7 @@ USING: editors io.standard-paths kernel make math.parser
 namespaces ;
 IN: editors.etexteditor
 
-SINGLETON: etexteditor
-
-editor-class [ etexteditor ] initialize
+EDITOR: etexteditor
 
 : etexteditor-path ( -- str )
     \ etexteditor-path get [

diff --git a/basis/editors/geany/geany.factor b/basis/editors/geany/geany.factor
index 897e294df1432609059821c2926fbf45baa592ea..073498e8d75d17a466e0bdb2cee9c71098d7f426 100644 (file)
--- a/basis/editors/geany/geany.factor
+++ b/basis/editors/geany/geany.factor
@@ -4,9 +4,7 @@ USING: combinators.short-circuit editors io.standard-paths
 kernel make math.parser namespaces system ;
 IN: editors.geany
 
-SINGLETON: geany
-
-editor-class [ geany ] initialize
+EDITOR: geany
 
 SYMBOL: geany-path
 

diff --git a/basis/editors/gedit/gedit.factor b/basis/editors/gedit/gedit.factor
index 1b617c2fa25b6fe5abb70c7c5aae57961e9f8f0a..72fbffcc331c0bcb2d453c8d7eb9ab47aa7e2bda 100644 (file)
--- a/basis/editors/gedit/gedit.factor
+++ b/basis/editors/gedit/gedit.factor
@@ -4,9 +4,7 @@ USING: editors io.launcher io.standard-paths kernel make
 math.parser namespaces sequences ;
 IN: editors.gedit
 
-SINGLETON: gedit
-
-editor-class [ gedit ] initialize
+EDITOR: gedit
 
 : gedit-path ( -- path )
     \ gedit-path get [

diff --git a/basis/editors/gvim/gvim.factor b/basis/editors/gvim/gvim.factor
index f230ada60367f5e88e1fafe27d76bf2c0b7da613..b8f13ebd95f9f7a938deff28d8aabfc65389b879 100644 (file)
--- a/basis/editors/gvim/gvim.factor
+++ b/basis/editors/gvim/gvim.factor
@@ -5,13 +5,10 @@ IN: editors.gvim
 ! This code builds on the code in editors.vim; see there for
 ! more information.
 
-SINGLETON: gvim
+EDITOR: gvim
 
 INSTANCE: gvim vim-base
 
-editor-class get-global dup [ vim? not ] when
-[ gvim editor-class set-global ] unless
-
 HOOK: find-gvim-path io-backend ( -- path )
 
 M: object find-gvim-path f ;

diff --git a/basis/editors/jedit/jedit.factor b/basis/editors/jedit/jedit.factor
index 174aff875acc62319ad2e2990919335c52926011..ccdcada538c3ce09bef9380a241010b149a74179 100644 (file)
--- a/basis/editors/jedit/jedit.factor
+++ b/basis/editors/jedit/jedit.factor
@@ -5,9 +5,7 @@ io.standard-paths kernel make math.parser namespaces sequences
 system ;
 IN: editors.jedit
 
-SINGLETON: jedit
-
-editor-class [ jedit ] initialize
+EDITOR: jedit
 
 HOOK: find-jedit-path os ( -- path )
 

diff --git a/basis/editors/kakoune/kakoune.factor b/basis/editors/kakoune/kakoune.factor
index b7a29cdfae9569aa8231fe04f7ebaefb3f8fadb7..2c186be25204c45ba28a432e64c1267af90d4335 100644 (file)
--- a/basis/editors/kakoune/kakoune.factor
+++ b/basis/editors/kakoune/kakoune.factor
@@ -2,9 +2,7 @@ USING: editors io.standard-paths kernel make math.parser
 namespaces sequences strings ;
 IN: editors.kakoune
 
-SINGLETON: kakoune
-
-editor-class [ kakoune ] initialize
+EDITOR: kakoune
 
 SYMBOL: kak-path
 

diff --git a/basis/editors/kate/kate.factor b/basis/editors/kate/kate.factor
index 79e54d8e36ab11ab6b100ae77cab4cb64123f2cd..45639b3fdcdcd9d10da37b8d9223ffb4c028d917 100644 (file)
--- a/basis/editors/kate/kate.factor
+++ b/basis/editors/kate/kate.factor
@@ -3,9 +3,7 @@ math.parser namespaces sequences system ;
 
 IN: editors.kate
 
-SINGLETON: kate
-
-editor-class [ kate ] initialize
+EDITOR: kate
 
 HOOK: find-kate-path os ( -- path )
 

diff --git a/basis/editors/lapce/lapce.factor b/basis/editors/lapce/lapce.factor
index 6777e7bfcbff4bb30f7c05a3de283f402aed5943..b4c8c28986e395a0ea9a35a3f6f4745c2f465716 100644 (file)
--- a/basis/editors/lapce/lapce.factor
+++ b/basis/editors/lapce/lapce.factor
@@ -3,9 +3,7 @@ math.parser namespaces sequences system ;
 
 IN: editors.lapce
 
-SINGLETON: lapce
-
-editor-class [ lapce ] initialize
+EDITOR: lapce
 
 HOOK: find-lapce-path os ( -- path )
 

diff --git a/basis/editors/lite-xl/lite-xl.factor b/basis/editors/lite-xl/lite-xl.factor
index e94c2dd37ff6967b292d259aeba0a2000396288f..52094b68810416d0afda405071f588833dd30f19 100644 (file)
--- a/basis/editors/lite-xl/lite-xl.factor
+++ b/basis/editors/lite-xl/lite-xl.factor
@@ -2,9 +2,7 @@ USING: combinators.short-circuit editors io.pathnames
 io.standard-paths kernel make namespaces strings system ;
 IN: editors.lite-xl
 
-SINGLETON: lite-xl
-
-editor-class [ lite-xl ] initialize
+EDITOR: lite-xl
 
 SYMBOL: lite-xl-editor-path
 

diff --git a/basis/editors/macvim/macvim.factor b/basis/editors/macvim/macvim.factor
index cc3267fdb67ca2d96555f3a31dc0af003e180d94..5f55665366acc0d5c272aa7b08696fedf8d92b84 100644 (file)
--- a/basis/editors/macvim/macvim.factor
+++ b/basis/editors/macvim/macvim.factor
@@ -2,13 +2,10 @@ USING: editors editors.vim io.pathnames io.standard-paths kernel
 namespaces ;
 IN: editors.macvim
 
-SINGLETON: macvim
+EDITOR: macvim
 
 INSTANCE: macvim vim-base
 
-editor-class get-global dup [ vim? not ] when
-[ macvim editor-class set-global ] unless
-
 : find-macvim-bundle-path ( -- path/f )
     "org.vim.MacVim" find-native-bundle [
         "Contents/MacOS/Vim" append-path

diff --git a/basis/editors/notepad++/notepad++.factor b/basis/editors/notepad++/notepad++.factor
index daae4beb085ded9640644d9dc88e1cac04762832..3a796e22baed67dcb1a17e54d153fc87920b22b5 100644 (file)
--- a/basis/editors/notepad++/notepad++.factor
+++ b/basis/editors/notepad++/notepad++.factor
@@ -2,9 +2,7 @@ USING: editors io.standard-paths kernel make math.parser
 namespaces sequences ;
 IN: editors.notepad++
 
-SINGLETON: notepad++
-
-editor-class [ notepad++ ] initialize
+EDITOR: notepad++
 
 : notepad++-path ( -- path )
     \ notepad++-path get [

diff --git a/basis/editors/notepad/notepad.factor b/basis/editors/notepad/notepad.factor
index 5268d2b7a12c0a877e858615c5f5c31c2713db55..1c430c9974c8c8b11208786295198483cd434caf 100644 (file)
--- a/basis/editors/notepad/notepad.factor
+++ b/basis/editors/notepad/notepad.factor
@@ -5,9 +5,7 @@ kernel namespaces sequences windows.shell32 ;
 
 IN: editors.notepad
 
-SINGLETON: notepad
-
-editor-class [ notepad ] initialize
+EDITOR: notepad
 
 : notepad-path ( -- path )
     \ notepad-path get [

diff --git a/basis/editors/notepad2/notepad2.factor b/basis/editors/notepad2/notepad2.factor
index 4f5b857385ce5d9df0d65f87f6aa706797e45c77..2e110db0e16fbf1fac61fc1003ae6d11b404f159 100644 (file)
--- a/basis/editors/notepad2/notepad2.factor
+++ b/basis/editors/notepad2/notepad2.factor
@@ -2,9 +2,7 @@ USING: editors io.files io.launcher kernel math.parser
 namespaces sequences windows.shell32 make io.pathnames ;
 IN: editors.notepad2
 
-SINGLETON: notepad2
-
-editor-class [ notepad2 ] initialize
+EDITOR: notepad2
 
 : notepad2-path ( -- path )
     \ notepad2-path get [

diff --git a/basis/editors/nova/nova.factor b/basis/editors/nova/nova.factor
index db7da54a2d047b7e18b8c6b24567a109d8a9a90d..67107d01e3b07073f7e932b1a3b01f352eefa350 100644 (file)
--- a/basis/editors/nova/nova.factor
+++ b/basis/editors/nova/nova.factor
@@ -1,9 +1,7 @@
 USING: editors kernel make namespaces ;
 IN: editors.nova
 
-SINGLETON: nova
-
-editor-class [ nova ] initialize
+EDITOR: nova
 
 M: nova editor-command
     drop

diff --git a/basis/editors/scite/scite.factor b/basis/editors/scite/scite.factor
index 1b80c563d84e53820bfd1c1e7e626ebd9b515dee..b5ef168926ab34c3d8c7422825e1bec0a272e1d7 100644 (file)
--- a/basis/editors/scite/scite.factor
+++ b/basis/editors/scite/scite.factor
@@ -5,9 +5,7 @@ USING: editors io.standard-paths kernel make math.parser
 namespaces sequences system ;
 IN: editors.scite
 
-SINGLETON: scite
-
-editor-class [ scite ] initialize
+EDITOR: scite
 
 SYMBOL: scite-path
 

diff --git a/basis/editors/smultron/smultron.factor b/basis/editors/smultron/smultron.factor
index 0720d948019616e54e091e1fa3480897f6dd7a39..4e0ab3a81f81d8d7e14dad9632e1be2698f3a2ed 100644 (file)
--- a/basis/editors/smultron/smultron.factor
+++ b/basis/editors/smultron/smultron.factor
@@ -1,9 +1,7 @@
 USING: editors kernel make namespaces ;
 IN: editors.smultron
 
-SINGLETON: smultron
-
-editor-class [ smultron ] initialize
+EDITOR: smultron
 
 M: smultron editor-command
     drop

diff --git a/basis/editors/sublime/sublime.factor b/basis/editors/sublime/sublime.factor
index 84e713bf1d99dc50f569bc3ea5da5bc5faa3a44b..f084c338f848ec1c0290bd94f331d5a6a4c71c38 100644 (file)
--- a/basis/editors/sublime/sublime.factor
+++ b/basis/editors/sublime/sublime.factor
@@ -5,9 +5,7 @@ io.standard-paths kernel make math.parser namespaces sequences
 system ;
 IN: editors.sublime
 
-SINGLETON: sublime
-
-editor-class [ sublime ] initialize
+EDITOR: sublime
 
 HOOK: find-sublime-path os ( -- path )
 

diff --git a/basis/editors/ted-notepad/ted-notepad.factor b/basis/editors/ted-notepad/ted-notepad.factor
index 0dca51e2031dc14ccfcd748a193248082da9dd56..3040e282bc36a45d9ee3d8e42889d12ce765534e 100644 (file)
--- a/basis/editors/ted-notepad/ted-notepad.factor
+++ b/basis/editors/ted-notepad/ted-notepad.factor
@@ -2,9 +2,7 @@ USING: editors io.files io.launcher io.standard-paths kernel
 math.parser namespaces sequences make ;
 IN: editors.ted-notepad
 
-SINGLETON: ted-notepad
-
-editor-class [ ted-notepad ] initialize
+EDITOR: ted-notepad
 
 : ted-notepad-path ( -- path )
     \ ted-notepad-path get [

diff --git a/basis/editors/textadept/textadept.factor b/basis/editors/textadept/textadept.factor
index 8ba969cc27229af00e0fc44007aa75dfc656f665..c7398ad4cba187452718bce87c5be274d326b3a6 100644 (file)
--- a/basis/editors/textadept/textadept.factor
+++ b/basis/editors/textadept/textadept.factor
@@ -14,9 +14,7 @@ io.pathnames io.standard-paths kernel make math math.parser
 namespaces sequences system vocabs ;
 IN: editors.textadept
 
-SINGLETON: textadept
-
-editor-class [ textadept ] initialize
+EDITOR: textadept
 
 HOOK: find-textadept-path os ( -- path )
 

diff --git a/basis/editors/textedit/textedit.factor b/basis/editors/textedit/textedit.factor
index 5d7055ac30806ead119ea21468208cf123d0132e..fab8c0d066fa11c23fc3bd10e18726e0913fd5b2 100644 (file)
--- a/basis/editors/textedit/textedit.factor
+++ b/basis/editors/textedit/textedit.factor
@@ -2,9 +2,7 @@ USING: definitions io.launcher kernel math math.parser parser
 namespaces prettyprint editors make ;
 IN: editors.textedit
 
-SINGLETON: textedit
-
-editor-class [ textedit ] initialize
+EDITOR: textedit
 
 M: textedit editor-command
     drop

diff --git a/basis/editors/textmate/textmate.factor b/basis/editors/textmate/textmate.factor
index e7610d1b96bda389104154cfcf1910dbb68a5fde..b12e8acfa7cbb3ae652aaf581cb652db436fc45e 100644 (file)
--- a/basis/editors/textmate/textmate.factor
+++ b/basis/editors/textmate/textmate.factor
@@ -2,9 +2,7 @@ USING: definitions io.launcher kernel math math.parser parser
 namespaces prettyprint editors make ;
 IN: editors.textmate
 
-SINGLETON: textmate
-
-editor-class [ textmate ] initialize
+EDITOR: textmate
 
 M: textmate editor-command
     [ "mate" , "-a" , "-l" , number>string , , ] { } make ;

diff --git a/basis/editors/textpad/textpad.factor b/basis/editors/textpad/textpad.factor
index 025928d89657c1e67ed02757f43e8417e7c50177..4104ca2ef5b356984862e464144be395ec101c44 100644 (file)
--- a/basis/editors/textpad/textpad.factor
+++ b/basis/editors/textpad/textpad.factor
@@ -2,9 +2,7 @@ USING: editors io.standard-paths kernel make math.parser
 namespaces sequences ;
 IN: editors.textpad
 
-SINGLETON: textpad
-
-editor-class [ textpad ] initialize
+EDITOR: textpad
 
 : textpad-path ( -- path )
     \ textpad-path get-global [

diff --git a/basis/editors/textwrangler/textwrangler.factor b/basis/editors/textwrangler/textwrangler.factor
index 581670e33ef9a282be0a3498c183039d93c3aac5..e163dced3664ac749db5ae361ec25dd9eb6f2366 100644 (file)
--- a/basis/editors/textwrangler/textwrangler.factor
+++ b/basis/editors/textwrangler/textwrangler.factor
@@ -11,9 +11,7 @@ IN: editors.textwrangler
 
 ! Note that launching with ``open -a`` does not support line numbers.
 
-SINGLETON: textwrangler
-
-editor-class [ textwrangler ] initialize
+EDITOR: textwrangler
 
 M: textwrangler editor-command
     "edit" find-in-path [

diff --git a/basis/editors/ui/ui.factor b/basis/editors/ui/ui.factor
index e45a1906ecb8d484fba36af870f56bb166079eb7..fe79224d1d9fd7da3a8f69aa2fa682c1f316c952 100644 (file)
--- a/basis/editors/ui/ui.factor
+++ b/basis/editors/ui/ui.factor
@@ -1,15 +1,15 @@
 ! Copyright (C) 2018 Doug Coleman.
 ! See https://factorcode.org/license.txt for BSD license.
-USING: accessors editors kernel namespaces sequences ui
-ui.gadgets ui.gadgets.borders ui.gadgets.buttons
+USING: accessors editors kernel namespaces sequences splitting
+ui ui.gadgets ui.gadgets.borders ui.gadgets.buttons
 ui.gadgets.packs ui.gadgets.scrollers ui.tools.listener
-vocabs.loader ;
+vocabs.loader vocabs.parser ;
 IN: editors.ui
 
 : <reload-editor-button> ( editor -- button )
     dup '[
-        drop
-        [ f editor-class set-global _ reload ]
+        drop 
+        [ _ [ reload ] [ use-vocab ] [ "editors." ?head drop search editor-class set-global ] tri ]
         \ run call-listener
     ] <border-button> ;
 

diff --git a/basis/editors/ultraedit/ultraedit.factor b/basis/editors/ultraedit/ultraedit.factor
index 970a10353cda3be8fedeb385eaf42a6c2b4b423c..3eb9711099e2c80146912199eb70d679439c7e58 100644 (file)
--- a/basis/editors/ultraedit/ultraedit.factor
+++ b/basis/editors/ultraedit/ultraedit.factor
@@ -2,9 +2,7 @@ USING: editors io.pathnames io.standard-paths kernel make
 math.parser namespaces system ;
 IN: editors.ultraedit
 
-SINGLETON: ultraedit
-
-editor-class [ ultraedit ] initialize
+EDITOR: ultraedit
 
 HOOK: find-ultraedit os ( -- path )
 

diff --git a/basis/editors/vim/vim.factor b/basis/editors/vim/vim.factor
index e44d80b70982497774cd4f48daa42dd67cf1305a..cb4b81e2a9096e66cb43537d0a246e921fbe4dc6 100644 (file)
--- a/basis/editors/vim/vim.factor
+++ b/basis/editors/vim/vim.factor
@@ -2,14 +2,12 @@ USING: editors io.standard-paths kernel make math.parser
 namespaces sequences strings ;
 IN: editors.vim
 
-SINGLETON: vim
+EDITOR: vim
 
 MIXIN: vim-base
 
 INSTANCE: vim vim-base
 
-editor-class [ vim ] initialize
-
 SYMBOL: vim-path
 
 HOOK: find-vim-path editor-class ( -- path )

diff --git a/basis/editors/visual-studio-code-exploration/visual-studio-code-exploration.factor b/basis/editors/visual-studio-code-exploration/visual-studio-code-exploration.factor
index d42fdb6c520392c0b5c05a9240b241096e94c6a0..1f9050dac1bfac305d6ca0c16586500cbe080e7c 100644 (file)
--- a/basis/editors/visual-studio-code-exploration/visual-studio-code-exploration.factor
+++ b/basis/editors/visual-studio-code-exploration/visual-studio-code-exploration.factor
@@ -5,12 +5,10 @@ io.pathnames io.standard-paths kernel namespaces system
 tools.which ;
 IN: editors.visual-studio-code-exploration
 
-SINGLETON: visual-studio-code-exploration
+EDITOR: visual-studio-code-exploration
 
 INSTANCE: visual-studio-code-exploration visual-studio-code-base
 
-editor-class [ visual-studio-code-exploration ] initialize
-
 M: visual-studio-code-exploration find-visual-studio-code-path
     os {
         { linux [ "code-exploration" which ] }

diff --git a/basis/editors/visual-studio-code-insiders/visual-studio-code-insiders.factor b/basis/editors/visual-studio-code-insiders/visual-studio-code-insiders.factor
index 10a75efcf869d14eb682830d31f40786a7255c42..9477c56f0884af983687722db39c8c3e5ccbe36b 100644 (file)
--- a/basis/editors/visual-studio-code-insiders/visual-studio-code-insiders.factor
+++ b/basis/editors/visual-studio-code-insiders/visual-studio-code-insiders.factor
@@ -5,12 +5,10 @@ io.pathnames io.standard-paths kernel namespaces system
 tools.which ;
 IN: editors.visual-studio-code-insiders
 
-SINGLETON: visual-studio-code-insiders
+EDITOR: visual-studio-code-insiders
 
 INSTANCE: visual-studio-code-insiders visual-studio-code-base
 
-editor-class [ visual-studio-code-insiders ] initialize
-
 M: visual-studio-code-insiders find-visual-studio-code-path
     os {
         { linux [ "code-insiders" which ] }

diff --git a/basis/editors/visual-studio-code/visual-studio-code.factor b/basis/editors/visual-studio-code/visual-studio-code.factor
index a3c752b8815c4ecef620cbce18a7c93d7779f744..137ad93c62d1ba590969c46a020cc8075bded9ad 100644 (file)
--- a/basis/editors/visual-studio-code/visual-studio-code.factor
+++ b/basis/editors/visual-studio-code/visual-studio-code.factor
@@ -10,12 +10,10 @@ IN: editors.visual-studio-code
 
 MIXIN: visual-studio-code-base
 
-SINGLETON: visual-studio-code
+EDITOR: visual-studio-code
 
 INSTANCE: visual-studio-code visual-studio-code-base
 
-editor-class [ visual-studio-code ] initialize
-
 HOOK: find-visual-studio-code-path editor-class ( -- path )
 
 M: visual-studio-code-base find-visual-studio-code-path

diff --git a/basis/editors/visual-studio-codium/visual-studio-codium.factor b/basis/editors/visual-studio-codium/visual-studio-codium.factor
index ebfdec5b062b9f921a1df6e9230308d5a3d4349a..250f7906225df091401e7b41b00821085a2e6f19 100644 (file)
--- a/basis/editors/visual-studio-codium/visual-studio-codium.factor
+++ b/basis/editors/visual-studio-codium/visual-studio-codium.factor
@@ -5,12 +5,10 @@ io.pathnames io.standard-paths kernel namespaces system
 tools.which ;
 IN: editors.visual-studio-codium
 
-SINGLETON: visual-studio-codium
+EDITOR: visual-studio-codium
 
 INSTANCE: visual-studio-codium visual-studio-code-base
 
-editor-class [ visual-studio-codium ] initialize
-
 M: visual-studio-codium find-visual-studio-code-path
     os {
         { linux [ "codium" which ] }

diff --git a/basis/editors/wordpad/wordpad.factor b/basis/editors/wordpad/wordpad.factor
index 6d8fa4835c537ed71a4c62e65b87e3c8bd050802..a08f86af3981b15bb8a48c9308278a17b2640e5f 100644 (file)
--- a/basis/editors/wordpad/wordpad.factor
+++ b/basis/editors/wordpad/wordpad.factor
@@ -1,9 +1,7 @@
 USING: arrays editors io.standard-paths kernel namespaces ;
 IN: editors.wordpad
 
-SINGLETON: wordpad
-
-editor-class [ wordpad ] initialize
+EDITOR: wordpad
 
 : wordpad-path ( -- path )
     \ wordpad-path get [

diff --git a/basis/editors/xcode/xcode.factor b/basis/editors/xcode/xcode.factor
index b694e2fc1dd6ca49fa4d3eaecedeafe4f1df1c47..dcc45e14d7dd02b0a7daa1f651239b3fd2b02146 100644 (file)
--- a/basis/editors/xcode/xcode.factor
+++ b/basis/editors/xcode/xcode.factor
@@ -1,9 +1,7 @@
 USING: editors kernel make namespaces ;
 IN: editors.xcode
 
-SINGLETON: xcode
-
-editor-class [ xcode ] initialize
+EDITOR: xcode
 
 M: xcode editor-command
     drop