Merge pull request #1373 from fox0430/develop

v0.2.7
fox0430 · Jun 22, 2021 · 977d54a · 977d54a
2 parents 5de2054 + 4b35734
commit 977d54a
Show file tree

Hide file tree

Showing 60 changed files with 4,166 additions and 2,396 deletions.
diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml
@@ -1,16 +1,21 @@
-name: Build
+name: Tests
 
 on:
   push:
     paths-ignore:
       - 'LICENSE'
       - '*.md'
-      - 'documents/*.md'
+      - 'documents/'
+      - 'docs/'
+    branches:
+      - develop
+      - master
   pull_request:
     paths-ignore:
       - 'LICENSE'
       - '*.md'
-      - 'documents/*.md'
+      - 'documents/'
+      - 'docs/'
 
 jobs:
   skip:
@@ -35,7 +40,7 @@ jobs:
           # - macOS-latest
           # - windows-latest
     env:
-      NIM_VERSION: 1.4.6
+      NIM_VERSION: 1.4.8
     steps:
     - uses: actions/checkout@v1
     - run: |

diff --git a/README.md b/README.md
@@ -29,11 +29,9 @@ This project's goal is a very customizable, high productivity, user friendly, hi
 
 - Configuration file (TOML)
 
-- Configuration mode (Incomplete)
+- Configuration mode
 
-- Live reload of configuration file
-
-- Multiple file buffers
+- Live reload of the configuration file
 
 - Vertical/Horizontal split window
 
@@ -57,8 +55,6 @@ This project's goal is a very customizable, high productivity, user friendly, hi
 
 - Build on save
 
-- Work space
-
 - Multiple status line
 
 - QuickRun
@@ -69,6 +65,8 @@ This project's goal is a very customizable, high productivity, user friendly, hi
 
 - Highlight/Delete trailing spaces
 
+- Vim like register
+
 ## Planned features
 
 - Supports regular expression and PEG
@@ -130,7 +128,7 @@ Check [detail](https://github.com/fox0430/moe/blob/develop/documents/overview.md
 moe is a recursive acronym for "moe is an optimal editor".    
 And one more, it comes from the Japanese slang 萌え(moe).
 
-## Contributing, bug reports, requests
+## Contributing, bug reports, feature request
 Welcome❤
 
 ## Community

diff --git a/documents/configfile.md b/documents/configfile.md
@@ -259,14 +259,6 @@ Override commands executed at build (string)
 command
 ```
 
-### WorkSpace table
-
-Enable/Disable workspace bar (bool)  
-default is false
-```
-workSpaceLine
-```
-
 ### Highlight table
 
 Highlight the current line (bool)  
@@ -485,18 +477,6 @@ default is true
 saveLogNotify
 ```
 
-Enable/disable workspace (create, delete, etc...) messages/notifications in status line (bool)  
-default is true
-```
-workspaceScreenNotify
-```
-
-Enable/disable workspace (create, delete, etc...) messages/notifications in status line (bool)  
-default is true
-```
-workspaceLogNotify
-```
-
 Enable/disable QuickRun messages/notifications in status line (bool)  
 default is true
 ```
@@ -581,23 +561,6 @@ The default value is true.
 curosrPosition
 ```
 
-### Debug.WorkSpace table
-
-Show/Hidden all WorkSpace info in debug mode (bool)
-```
-enable
-```
-
-Show/Hidden the number of workspaces in debug mode (bool)
-```
-numOfWorkSpaces
-```
-
-Show/Hidden status.currentWorkSpaceIndex in debug mode (bool)
-```
-currentWorkSpaceIndex 
-```
-
 ### Debug.WindowNode table
 
 Show/Hidden all windowNode info in debug mode (bool)
@@ -685,6 +648,42 @@ Show/Hidden windowNode.curosr in debug mode (bool)
 cursor
 ```
 
+### Debug.EditorView table
+Show/Hidden all editorview info in debug mode (bool)
+```
+enable
+```
+
+Show/Hidden editorview.widthOfLineNum in debug mode (bool)
+```
+widthOfLineNum
+```
+
+Show/Hidden editorview.height in debug mode (bool)
+```
+height
+```
+
+Show/Hidden editorview.width in debug mode (bool)
+```
+width
+```
+
+Show/Hidden editorview.originalLine in debug mode (bool)
+```
+originalLine
+```
+
+Show/Hidden editorview.start in debug mode (bool)
+```
+start
+```
+
+Show/Hidden editorview.length in debug mode (bool)
+```
+length
+```
+
 ### Debug.BufStatus table
 
 Show/Hidden all bufStatus info in debug mode (bool)
@@ -1442,16 +1441,6 @@ Trailing space background color
 highlightTrailingSpacesBg
 ```
 
-Workspace bar text color
-```
-workSpaceBar
-```
-
-Workspace bar background color
-```
-workSpaceBarBg
-```
-
 Reserved word text color
 ```
 reservedWord

diff --git a/documents/developer.md b/documents/developer.md
@@ -1,4 +1,4 @@
-# developer documentation
+# Developer documentation
 
 ## How to debug moe 
 ### printf debug
@@ -99,9 +99,6 @@ Messages displayed in the command line window.
 ### ```src/moepkg/window.nim```
 Management of the main window node.
 
-### ```src/moepkg/workspaceWorkSpace.nim```
-Define WorkSpace object.
-
 ### ```src/moepkg/tabline.nim```
 Write Tab line.
 
@@ -186,3 +183,12 @@ Implementation of Automatic backups.
 
 ### ```src/moepkg/buffermanager.nim```
 Buffer manager mode and commands. (```:buf```)
+
+### ```src/moepkg/register.nim```
+Definition of the registers and utils for the register.
+
+###  ```src/moepkg/clipboard.nim```
+Utils for the clipboard.
+
+###  ```src/moepkg/platform.nim```
+Check and definition the platform.
diff --git a/documents/features.md b/documents/features.md
@@ -52,3 +52,30 @@ If you select backup file, you can check the difference from the current origina
 
 moe can now use simple auto-complete.  
 It is possible to auto-complete a words in the currently open buffer.
+
+## Register
+
+moe can use Vim-like registers.
+
+### Number register
+| Name | Description                                                                       |
+|------|-----------------------------------------------------------------------------------|
+| 0    | Yanked text                                                                       |
+| 1    | Deleted line. One line or less is stored in the small delete register ```-```     |
+| 2    | Every time a new delete command is issued, the contents of ```1``` are stored     |
+| 3~9  | Similar to ```2```, the contents of the previous register are stored sequentially |
+
+### Small delete register
+| Name | Description   |
+|------|---------------|
+| -    | Deleted text  |
+
+### Named register
+
+| Name | Description            |
+|------|------------------------|
+| a~z  | Any text can be stored |
+
+### No name register
+
+Stores the value of the last used register.
diff --git a/documents/howtouse.md b/documents/howtouse.md
@@ -4,8 +4,9 @@
 
 |                               |                             |                               |                             |                                   |
 |:-----------------------------:|:---------------------------:|:-----------------------------:|:---------------------------:|:---------------------------------:|
-| [Normal Mode](#normal-mode)   | [Visual Mode](#visual-block-mode) | [Replace Mode](#replace-mode) | [Insert Mode](#insert-mode) | [History Mode](#history-mode)     |
-| [Ex Mode](#ex-mode)       | [Diff Mode](#diff-mode)     | [Filer Mode](#filer-mode)     | [Exiting](#exiting)         | [Changing Modes](#changing-modes) |
+| [Normal Mode](#normal-mode)   | [Register](#register) | [Visual Mode](#visual-block-mode) | [Replace Mode](#replace-mode) | [Insert Mode](#insert-mode) | 
+| [History Mode](#history-mode)     | [Ex Mode](#ex-mode)       | [Diff Mode](#diff-mode)     | [Filer Mode](#filer-mode)     | [Exiting](#exiting)         |
+| [Changing Modes](#changing-modes) |
 
 
 ## Exiting
@@ -62,6 +63,20 @@
 
 </details>
 
+## Register
+
+<details open>
+  <summary>Register operations</summary>
+
+  |                               |                             |                               |                             |
+  |:-----------------------------:|:---------------------------:|:-----------------------------:|:---------------------------:|
+  | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**y**</kbd> <kbd>**y**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**y**</kbd> <kbd>**l**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**y**</kbd> <kbd>**w**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**y**</kbd> <kbd>**{**</kbd> |
+  | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**y**</kbd> <kbd>**}**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**p**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**P**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**d**</kbd> <kbd>**d**</kbd> |
+  | <kbd>**"**</kbd> <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**d**</kbd> <kbd>**w**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**d**</kbd> <kbd>**$**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**d**</kbd> <kbd>**0**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**d**</kbd> <kbd>**G**</kbd> |
+  | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**d**</kbd> <kbd>**g**</kbd> <kbd>**g**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**d**</kbd> <kbd>**{**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**d**</kbd> <kbd>**}**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**d**</kbd> <kbd>**i**</kbd> <kbd>**any key**</kbd> |
+  | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**d**</kbd> <kbd>**h**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**c**</kbd> <kbd>**l**</kbd> OR <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**s**</kbd> | <kbd>**"**</kbd> <kbd>**register name**</kbd> <kbd>**c**</kbd> <kbd>**i**</kbd> <kbd>**any key**</kbd> |
+
+</details>
 
 ## Visual block mode
 
@@ -72,9 +87,12 @@
 |:-----------------------------:|:---------------------------:|:-----------------------------:|:---------------------------:|:---------------------------------:|
 | <kbd>**d**</kbd> OR <kbd>**x**</kbd><br> Delete text | <kbd>**y**</kbd><br> Copy text | <kbd>**r**</kbd><br> Replace character | <kbd>**J**</kbd><br> Join lines | <kbd>**J**</kbd><br> Join lines |
 | <kbd>**u**</kbd><br> Convert to Lowercase | <kbd>**U**</kbd><br> Convert to Uppercase | <kbd>**>**</kbd><br> Indent | <kbd>**<**</kbd><br> Unindent | <kbd>**~**</kbd><br> Toggle case of character under cursor |
-| <kbd>**Ctrl**</kbd> <kbd>**a**</kbd><br> Increase number under cursor | <kbd>**Ctrl**</kbd> <kbd>**x**</kbd><br> Decrease number under cursor | <kbd>**I**</kbd><br> Insert character, multiple lines | <kbd>**Esc**</kbd><br> Go to Normal mode |  |
+| <kbd>**Ctrl**</kbd> <kbd>**a**</kbd><br> Increase number under cursor | <kbd>**Ctrl**</kbd> <kbd>**x**</kbd><br> Decrease number under cursor | <kbd>**I**</kbd><br> Insert character, multiple lines | <kbd>**Esc**</kbd><br> Go to Normal mode | <kbd>**j**</kbd><br> Go Down :arrow_down: |
+| <kbd>**k**</kbd><br> Go Up :arrow_up: | <kbd>**j**</kbd><br> Go Left :arrow_left: | <kbd>**k**</kbd><br> Go Up :arrow_up: |
 
-</details>| <kbd>**j**</kbd><br> Go Down :arrow_down: | <kbd>**k**</kbd><br> Go Up :arrow_up: | <kbd>**j**</kbd><br> Go Left :arrow_left: | <kbd>**k**</kbd><br> Go Up :arrow_up: |
+</details>
+
+## Replace mode
 
 <details open>
   <summary>Replace Text</summary>
@@ -175,11 +193,6 @@
 ```sv``` - Horizontal split window  
 ```sp filename``` - Open in horizontal split window  
 
-```cws``` - Create new work space  
-```ws number``` - Change current work space : Example ```ws 2```  
-```dws``` - Delete current work space  
-```lsw``` - Show workspace list in status line
-
 ```livereload on``` or ```livereload on``` - Change setting of live reload of configuration file  
 ```theme themeName``` - Change color theme : Example ```theme dark```  
 ```tab on``` or ```tab off``` - Change setting to tab line  

diff --git a/example/moerc.toml b/example/moerc.toml
@@ -95,9 +95,6 @@ showGitInactive = false
 
 showModeInactive = false
 
-[WorkSpace]
-
-workSpaceLine = false
 
 [Highlight]
 
@@ -176,10 +173,6 @@ saveScreenNotify = true
 
 saveLogNotify = true
 
-workspaceScreenNotify = true
-
-workspaceLogNotify = true
-
 quickRunScreenNotify = true
 
 quickRunLogNotify = true
@@ -212,11 +205,6 @@ search = true
 
 cursorPosition = true
 
-[Debug.WorkSpace]
-enable = true
-numOfWorkSpaces = true
-currentWorkSpaceIndex = true
-
 [Debug.WindowNode]
 enable = true
 currentWindow = true
@@ -236,6 +224,15 @@ currentColumn = true
 expandedColumn = true
 cursor = true
 
+[Debug.EditorView]
+enable = true
+widthOfLineNum = true
+height = true
+width = true
+originalLine = false
+start = false
+length = false
+
 [Debug.BufferStatus]
 enable = true
 bufferIndex = true
@@ -377,10 +374,6 @@ highlightFullWidthSpaceBg = "red"
 highlightTrailingSpaces = "red"
 highlightTrailingSpacesBg = "red"
 
-# work space bar
-workSpaceBar = "white"
-workSpaceBarBg = "blue"
-
 # highlight reserved words
 reservedWord = "white"
 reservedWordBg = "gray"

diff --git a/moe.nimble b/moe.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.2.6.1"
+version       = "0.2.7.0"
 author        = "fox0430"
 description   = "A command lined based text editor"
 license       = "GPLv3"

diff --git a/src/moe.nim b/src/moe.nim
@@ -49,8 +49,7 @@ proc initEditor(): EditorStatus =
 proc main() =
   var status = initEditor()
 
-  while status.workSpace.len > 0 and
-        currentWorkSpace.numOfMainWindow > 0:
+  while status.mainWindow.numOfMainWindow > 0:
 
     case currentBufStatus.mode:
     of Mode.normal: status.normalMode