Commit Graph

224 Commits

Author SHA1 Message Date
hydroflame
83ef5a940b
Merge branch 'dev' into prompt-additions 2022-03-17 15:38:13 -04:00
BB
4eb59ac70c Turned on no-useless-concat lint and fixed it in code 2022-03-16 20:44:52 +01:00
hydroflame
f62c0c0cef
Merge pull request #3137 from phyzical/feature/filter-open-scripts
Add the ability to filter open scripts
2022-03-16 14:50:30 -04:00
phyzical
61ed4a4d43 Add the ability to filter open scripts
* icon that opens up on click and reset and closes on X
2022-03-15 20:37:11 +08:00
Jack
41974b042c
Merge branch 'dev' into bugfix/2958 2022-03-15 20:34:08 +08:00
Jack
2fa7aa6503
Update src/ScriptEditor/ui/ScriptEditorRoot.tsx
Co-authored-by: nickofolas <60761231+nickofolas@users.noreply.github.com>
2022-03-12 11:40:45 +08:00
nickofolas
a1b3dddf9e Add minHeight to editor tabs 2022-03-11 11:10:28 -06:00
Jack
6f10d5f8bf
Merge branch 'dev' into bugfix/2958 2022-03-11 17:49:35 +08:00
nickofolas
0236bdc73d
Merge branch 'dev' into feature/monaco-theme-editor 2022-03-10 23:16:44 -06:00
nickofolas
c7e228807b Resolve conflict 2022-03-10 23:11:09 -06:00
Olivier Gagnon
9c3c83dcd5 fix lint 2022-03-10 22:34:54 -05:00
hydroflame
b7ffdeb5e2
Merge pull request #3076 from ApamNapat/turned_two_eslint_rules_on
Trailing whitespace and files not ending with \n are now illegal
2022-03-10 22:12:17 -05:00
hydroflame
9372eef691
Merge pull request #2930 from JParisFerrer/vim_tab_switching
Add tab switching support to vim mode
2022-03-10 21:45:14 -05:00
hydroflame
e5c488e533
Merge pull request #3066 from phyzical/hotfix/2961-2
Fix editor "close" naming
2022-03-10 21:41:22 -05:00
BB
2f4d879c16 Trailing whitespace and files not ending with \n are now illegal 2022-03-08 22:51:02 +01:00
nickofolas
472503814b Remove 200px min width of script editor tabs 2022-03-07 17:33:56 -06:00
phyzical
c5fc009d91 renamed close to Terminal
* evened out spacing of buttons
2022-03-05 12:23:10 +08:00
BB
7212cc2f1c Removed unnecessary eslint-disable lines 2022-03-01 17:33:27 +01:00
nickofolas
67382f0ac9 Add missing newline at end of file 2022-02-20 09:03:16 -06:00
phyzical
7dd8deb1ed missed a change 2022-02-16 20:16:27 +08:00
phyzical
26002e0429 added logic to display server on save dialog
*added logic to display external servers as red
2022-02-16 20:11:37 +08:00
phyzical
ca28582265 added logic to also check hostname for "current script" 2022-02-16 18:41:22 +08:00
phyzical
d586743bf6 fixes for editor and tabs when names too long
* coupled some of the styles to avoid breaking this later on
* added tooltip incase its too long/ too small
* changes to use elipsis and RTL to read the end of file name
2022-02-09 00:12:37 +08:00
Jordi Paris Ferrer
419d585694 add tab switching support to vim mode 2022-02-06 16:34:14 -08:00
nickofolas
21e27dfab6 Save data sanitization
- Run in `Editor.beforeMount`, as well as when the
options modal is closed
- Recursively validates all token colors and
replaces them with bright red if they're invalid
2022-01-30 10:38:58 -06:00
Phil
08d0b4cbae Adding support for text/select options in Prompt command 2022-01-30 14:06:18 +00:00
nickofolas
dd77deca7b Add Paper styling to modal 2022-01-29 23:54:36 -06:00
nickofolas
e800886d42 Tie up loose ends
- Ensure that customTheme is redefined whenever the options modal
is closed, regardless of saved or not
- Reset the pending value for the theme editor whenever modal is clsoed
2022-01-29 23:44:31 -06:00
nickofolas
7ad0c53234 Update label for common.accent 2022-01-29 23:19:24 -06:00
nickofolas
83e5b46f3e Implement Monaco theme editor 2022-01-29 23:17:57 -06:00
nickofolas
5a476178fa Add types token 2022-01-29 23:11:21 -06:00
nickofolas
4ba6926e01 Theme attribute cleanup 2022-01-29 22:39:13 -06:00
nickofolas
20d3115e4a Framework for custom theme 2022-01-29 19:27:49 -06:00
smolgumball
2add4e9112 Merge branch 'dev' into add-ns-getRecentScripts 2022-01-26 19:07:02 -07:00
nickofolas
1a8a24587f Ensure that the proper editor is updated by syncing 2022-01-20 17:45:54 -06:00
nickofolas
a5ad97f47d Remove unnecessary editor code 2022-01-20 17:28:19 -06:00
nickofolas
99ef71de4a Update prompt message content 2022-01-20 17:14:38 -06:00
nickofolas
bc50f5180a Refactor 2022-01-20 15:48:17 -06:00
nickofolas
b4a78c26f3 Implement editor tab actions 2022-01-20 15:48:16 -06:00
smolgumball
74e2acfa6f Add ns.getRecentScripts() 2022-01-19 00:04:48 -07:00
nickofolas
258a1b262e Update options button 2022-01-17 17:20:38 -06:00
nickofolas
a9314f2447 Show N/A when editing a txt file 2022-01-17 16:44:55 -06:00
nickofolas
c41cd68a8d Add modal to editor with RAM details 2022-01-17 16:32:45 -06:00
nickofolas
c1b777733f Improve clarity of editor tabs 2022-01-17 15:14:07 -06:00
Martin Fournier
aec2763b27 Ignore trailing whitespace for dirty file asterisk
Saved scripts is stored on servers with its starting & trailing whitespace removed, so
comparison would fail and show the file as dirty when there was a
trailing newline in the script.
2022-01-14 05:34:33 -05:00
nickofolas
e7983552dc Fix formatting for empty editor splash 2022-01-12 12:15:03 -06:00
hydroflame
7633f271db
Merge pull request #2265 from TheMas3212/fix-2119
Fix 2119
2022-01-08 13:56:05 -05:00
Christopher
ad0b73aaee fixed syntax highlighting (don't highlight partial tokens/keywords) 2022-01-07 19:19:03 -06:00
Martin Fournier
4b06bdd89c Add detailed ram cost to mem command 2022-01-05 16:41:48 -05:00
Olivier Gagnon
c59a267437 change sf4 2022-01-04 19:09:34 -05:00
hydroflame
0d02ce6308
Merge pull request #2326 from MartinFournier/feature/editor-wordwrap-option
Add wordWrap option to Monaco
2022-01-04 12:54:50 -05:00
Martin Fournier
f0161367af Add wordWrap option to Monaco 2022-01-04 09:41:44 -05:00
Dexalt142
914b06ec88 feat (editor theme): atom one dark theme 2022-01-04 18:39:09 +07:00
Olivier Gagnon
1e0e9f7bd7 change button text 2022-01-02 11:55:06 -05:00
TheMas3212
6251678532
clear currentScript to null not undefined 2022-01-02 02:16:32 +11:00
TheMas3212
a20dd47ec6
fixes #2119 close open scripts that exist on deleted servers
this prevents a crash by trying to open the script editor with a script
open that exists on a server that has been deleted

this is achieved by filtering the list of open scripts whenever the
editor is opened and removing any that exist on a server that has been
deleted
it also handles the case of the selected script being one that was
removed in which case it defaults to selecting the first script
2022-01-02 02:10:10 +11:00
Billy Vong
38366e45db fix(editor): Fix vim mode quit and add "wq"
This changes `:q` to be quit (w/o saving) and added `:wq` to save *and* close.
2021-12-30 13:14:54 -05:00
Olivier Gagnon
0fc95e6215 text editor improvements 2021-12-29 02:04:24 -05:00
Hedrauta
693c6480a0 as close as possible
Sadly, i can't color specific variables, because of monaco itself.
Did my best for this. 😉
2021-12-23 07:27:58 +01:00
Andrew Cooper
f2bdf00aba Closing the final script in your editor will take you to the terminal. 2021-12-22 00:26:01 +00:00
Olivier Gagnon
b2b682fa04 fix editor not loading files 2021-12-21 13:44:18 -05:00
Olivier Gagnon
41593e0dce fix editor not loading 2021-12-21 12:02:06 -05:00
hydroflame
c1c7131545
Merge branch 'dev' into feat/open-multiple-files-from-cli 2021-12-21 11:02:06 -05:00
hydroflame
81e3f2afd1
Merge pull request #1986 from billyvg/feat/add-vim-command
feat: add `vim` terminal command
2021-12-21 11:00:33 -05:00
hydroflame
4be5e45740
Merge pull request #2073 from billyvg/fix/window-resizing
fix: Update editor height when resizing window
2021-12-21 10:56:51 -05:00
65-7a
a6aebd4a29 Change model to plaintext for txt files 2021-12-21 10:35:03 +11:00
65-7a
56e540802b Disable RAM calculation for txt files 2021-12-21 10:21:22 +11:00
Billy Vong
bb2f8e883c feat: Support opening multiple files from command line 2021-12-20 16:55:17 -05:00
Billy Vong
d30edc7f59 feat: Add vim terminal command 2021-12-20 16:20:50 -05:00
Billy Vong
63891351be remove TODO 2021-12-20 14:05:59 -05:00
Billy Vong
60749eefa7 remove console + format 2021-12-20 14:05:22 -05:00
Billy Vong
ee177393fa fix: Update editor height when resizing window 2021-12-20 14:04:42 -05:00
Billy Vong
3fd904ff87 format 2021-12-20 10:48:32 -05:00
Billy Vong
6641ca9c73 fix ts 2021-12-20 10:45:44 -05:00
Billy Vong
517066a710 fix missed conflicts 2021-12-20 10:44:17 -05:00
Billy Vong
d372166c8b Merge branch 'dev' into feat/add-vim-mode 2021-12-20 10:36:58 -05:00
Martin Fournier
e60996b86c Focus editor when opening or changing tabs 2021-12-20 07:15:53 -05:00
Martin Fournier
08a4a1649f Linting ScriptEditor 2021-12-20 07:01:34 -05:00
BuildTools
302af48be4 Fixed merge conflict 2021-12-20 01:44:51 -06:00
BuildTools
6d90025370 Adapted PR #2055 to the refacted script editor code 2021-12-20 01:40:01 -06:00
BuildTools
e5c4c8f64b Rebased
Added hostname to tab name
Removed -tas arg from the rm command
2021-12-20 01:40:01 -06:00
BuildTools
cbfdfa5753 Removed testing log statements 2021-12-20 01:40:01 -06:00
BuildTools
3120d97cfa Update 2021-12-20 01:40:01 -06:00
BuildTools
6dc7dc42c5 resolved merge issue 2021-12-20 01:39:20 -06:00
Dan
6ec7fcb9fa
refactor(keybinds): change editor save keybind S
We need to stop the event from bubbling up to the browser and opening a
'save html' window to keep support in the browser, other than that,
straight forward change to swap keybinding to 'S' for saving in the
editor.

Resolves danielyxie/bitburner#2053
2021-12-20 04:34:27 +00:00
Martin Fournier
3b99da8474 Lint current problems & fix ignore paths 2021-12-19 13:17:44 -05:00
Olivier Gagnon
02605090df v1.2.0 2021-12-18 16:28:09 -05:00
BuildTools
59498f780a Small css tweaks 2021-12-18 07:11:59 -06:00
BuildTools
2265f797c4 Added the ability to open multiple script files at a time
Fixed a bug where ram would stay the same when switching between scripts

Fixed bug where updating ram could cause the GUI to crash

The editor will now go to the last edited line when switching tabs.

Tidied up the script editor UI
2021-12-18 04:10:25 -06:00
Billy Vong
b3f9380ebd prettier 2021-12-17 12:56:48 -05:00
Billy Vong
6fb5565b08 remove unused code 2021-12-17 12:48:50 -05:00
Billy Vong
fb5d374279 feat: Add vim mode to script editor
This adds an option to turn on vim mode using the `monaco-vim` library.
2021-12-17 12:34:00 -05:00
Olivier Gagnon
e5b4dd8e90 Files should be saved on the server that opened them. 2021-12-13 20:08:58 -05:00
Olivier Gagnon
c69eb34341 v1.0.1 2021-11-17 19:56:17 -05:00
Olivier Gagnon
cf2efe7698 few bugdic 2021-11-11 17:00:36 -05:00
Olivier Gagnon
3fe25d64e5 ns function token even more precise. 2021-11-11 11:21:21 -05:00
Olivier Gagnon
3f28b066b0 working on timestamps and make netscript function highlight more specific. 2021-11-11 10:07:16 -05:00
Olivier Gagnon
15b3a82a41 plenty of bug fix. 2021-11-10 19:28:20 -05:00
Olivier Gagnon
b692bb90b9 fix ns1 blue colors 2021-11-06 17:46:55 -04:00
Olivier Gagnon
d7c23b975c fix code not saving 2021-11-02 16:10:01 -04:00