v0.0.4

.travis.yml

@@ -2,21 +2,17 @@ language: c
 compiler:
   - gcc
 before_install:
-  # Set up libncursesw
   - sudo ln -sf /lib/x86_64-linux-gnu/libncursesw.so.5.9 /usr/lib/x86_64-linux-gnu/libncursesw.so
-  # Install nim
-  - git clone https://github.com/nim-lang/nim
-  - cd nim
-  - git clone --depth 1 git://github.com/nim-lang/csources
-  - cd csources && sh build.sh
-  - cd ..
-  - bin/nim c koch
-  - ./koch boot -d:release
-  - ./koch nimble
-  - cd ..
+  - export CHOOSENIM_NO_ANALYTICS=1
+  - curl https://nim-lang.org/choosenim/init.sh -sSf > init.sh
+  - sh init.sh -y
+  - export PATH=~/.nimble/bin:$PATH
+  - echo "export PATH=~/.nimble/bin:$PATH" >> ~/.profile
+  - choosenim stable
 before_script:
   - set -e
   - export PATH=$(pwd)/nim/bin:$(pwd):$PATH
 script:
+  - nimble refresh
   - yes | nimble test --verbose
   - nimble install --verbose

README.md

@@ -3,33 +3,35 @@
 
 ## moe
 
-moe is a command line based text editor.
+moe is a Vim inspired command line based text editor.
 
 This project's goal is a funny animation editor.
 
-![moe-0](https://user-images.githubusercontent.com/15966436/42743686-90deb5f8-88b5-11e8-9e5e-ae8202f64a98.jpg)
+![moe-0](https://user-images.githubusercontent.com/15966436/53622086-03be0580-3c3c-11e9-8f28-469a6bc39602.png)
 
 ## Features
 - Written in Nim  
 
 - Adopt GapBuffer  
 
+- UTF-8 and other encodings support (Incomplete)
+
 - Vim like keybinds and mode
 
+- Syntax highlighting (Nim, C, C++, C#, Java, Yaml)
+
 - Simple file manager
 
 - Auto close paren  
 
 - Simple auto indent  
 
-- UTF-8 and other encodings support (Incomplete)
-
 ## Planned features
 
-- Syntax highlighting  
-
 - Visual mode  
 
+- Multi-Buffer
+
 - Infinite undo/redo
 
 - Syntax checker  
@@ -44,6 +46,10 @@ This project's goal is a funny animation editor.
 
 - Git support
 
+- Select data structures
+
+- Language Server Protocol
+
 - Plugins
 
 - Funny animation...

example/moerc.toml

@@ -0,0 +1,19 @@
+[Standard]
+number = true 
+statusBar = true
+syntax = true
+tabStop = 2
+autoCloseParen = true
+autoIndent = true
+defaultCursor = "block"
+normalModeCursor = "block"
+insertModeCursor = "ibeam"
+
+[StatusBar]
+mode = true
+chanedMark = true
+line = true
+column = true
+encoding = true
+language = true
+directory = true

moe.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.0.35"
+version       = "0.0.4"
 author        = "fox0430/walkre"
 description   = "a command lined based text editor"
 license       = "GPLv3"
@@ -9,6 +9,7 @@ bin           = @["moe"]
 
 # Dependencies
 
-requires "nim >= 0.18.0"
-requires "ncurses >= 0.1.0"
-requires "unicodedb >= 0.5.2"
+requires "nim >= 0.19.4"
+requires "https://github.com/walkre-niboshi/nim-ncurses >= 0.1.0"
+requires "unicodedb >= 0.6.0"
+requires "parsetoml >= 0.4.0"

src/moe.nim

@@ -11,22 +11,32 @@ import moepkg/editorview
 import moepkg/gapbuffer
 import moepkg/independentutils
 import moepkg/unicodeext
+import moepkg/cmdoption
+import moepkg/settings
+import moepkg/highlight
+
+proc main() =
+  let parsedList = parseCommandLineOption(commandLineParams())
+
+  defer:
+    exitUi()
 
-when isMainModule:
   startUi()
 
   var status = initEditorStatus()
-  if commandLineParams().len >= 1:
-    status.filename = commandLineParams()[0].toRunes
+  status.settings = parseSettingsFile(getConfigDir() / "moe" / "moerc.toml")
+
+  if parsedList.filename != "":
+    status.filename = parsedList.filename.toRunes
+    status.language = detectLanguage(parsedList.filename)
     if existsFile($(status.filename)):
       try:
         let textAndEncoding = openFile(status.filename)
         status.buffer = textAndEncoding.text.toGapBuffer
         status.settings.characterEncoding = textAndEncoding.encoding
       except IOError:
-        echo(fmt"Failed to open: {status.filename}")
-        exitUi()
-        quit()
+        writeFileOpenErrorMessage(status.commandWindow, status.filename)
+        return
     elif existsDir($(status.filename)):
       try:
         setCurrentDir($(status.filename))
@@ -39,11 +49,11 @@ when isMainModule:
   else:
     status.buffer = newFile()
 
-  status.view = initEditorView(status.buffer, terminalHeight()-2, terminalWidth()-numberOfDigits(status.buffer.len)-2)
-
-  defer:
-    exitUi()
-    discard execShellCmd("printf '\\033[2 q'")
+  status.highlight = initHighlight($status.buffer, status.language)
+  let numberOfDigitsLen = if status.settings.lineNumber: numberOfDigits(status.buffer.len) - 2 else: 0
+  let useStatusBar = if status.settings.statusBar.useBar: 1 else: 0
+  status.view = initEditorView(status.buffer, terminalHeight() - useStatusBar - 1, terminalWidth() - numberOfDigitsLen)
+
   while true:
     case status.mode:
     of Mode.normal:
@@ -57,5 +67,7 @@ when isMainModule:
     of Mode.search:
       searchMode(status)
     of Mode.quit:
+      executeOnExit(status.settings)
       break
 
+when isMainModule: main()

src/moepkg/cmdoption.nim

@@ -0,0 +1,21 @@
+import parseopt, unicode
+
+type
+  ComdParsedList* = tuple[
+    filename: string 
+  ]
+
+proc parseCommandLineOption*(line: seq[string]): ComdParsedList  =
+  result.filename = ""
+  var parsedLine = initOptParser(line)
+  for kind, key, val in parsedLine.getopt():
+    case kind:
+      of cmdArgument:
+        result.filename = key
+      of cmdShortOption, cmdLongOption:
+        case key:
+          of "v", "version":
+            echo "v0.0.4"
+            quit()
+      of cmdEnd:
+        assert(false)

src/moepkg/editorstatus.nim

@@ -1,5 +1,5 @@
-import terminal, os, strformat
-import gapbuffer, editorview, ui, cursor, unicodeext
+import packages/docutils/highlite, strutils, terminal, os, strformat
+import gapbuffer, editorview, ui, cursor, unicodeext, highlight
 
 type Mode* = enum
   normal, insert, ex, filer, search, quit
@@ -8,14 +8,33 @@ type Registers* = object
   yankedLines*: seq[seq[Rune]]
   yankedStr*: seq[Rune]
 
-type EditorSettings = object
+type StatusBarSettings* = object
+  useBar*: bool
+  mode*: bool
+  filename*: bool
+  chanedMark*: bool
+  line*: bool
+  column*: bool
+  characterEncoding*: bool
+  language*: bool
+  directory*: bool
+
+type EditorSettings* = object
+  statusBar*: StatusBarSettings
+  lineNumber*: bool
+  syntax*: bool
   autoCloseParen*: bool
   autoIndent*: bool 
   tabStop*: int
-  characterEncoding*: CharacterEncoding
+  characterEncoding*: CharacterEncoding # TODO: move to EditorStatus ...?
+  defaultCursor*: CursorType
+  normalModeCursor*: CursorType
+  insertModeCursor*: CursorType
 
 type EditorStatus* = object
   buffer*: GapBuffer[seq[Rune]]
+  highlight*: Highlight
+  language*: SourceLanguage
   searchHistory*: seq[seq[Rune]]
   view*: EditorView
   cursor*: CursorPosition
@@ -40,59 +59,81 @@ proc initRegisters(): Registers =
   result.yankedLines = @[]
   result.yankedStr = @[]
 
-proc initEditorSettings(): EditorSettings =
+proc initStatusBarSettings*(): StatusBarSettings =
+  result.useBar = true
+  result.mode = true
+  result.filename = true
+  result.chanedMark = true
+  result.line = true
+  result.column = true
+  result.characterEncoding = true
+  result.language = true
+  result.directory = true
+
+proc initEditorSettings*(): EditorSettings =
+  result.statusBar = initStatusBarSettings()
+  result.lineNumber = true
+  result.syntax = true
   result.autoCloseParen = true
   result.autoIndent = true
   result.tabStop = 2
+  result.defaultCursor = CursorType.blockMode   # Terminal default curosr shape
+  result.normalModeCursor = CursorType.blockMode
+  result.insertModeCursor = CursorType.ibeamMode
 
 proc initEditorStatus*(): EditorStatus =
   result.currentDir = getCurrentDir().toRunes
+  result.language = SourceLanguage.langNone
   result.registers = initRegisters()
   result.settings = initEditorSettings()
   result.mode = Mode.normal
   result.prevMode = Mode.normal
 
-  result.mainWindow = initWindow(terminalHeight()-2, terminalWidth(), 0, 0)
-  result.statusWindow = initWindow(1, terminalWidth(), terminalHeight()-2, 0, ui.ColorPair.blackGreen)
+  let useStatusBar = if result.settings.statusBar.useBar: 1 else: 0
+  result.mainWindow = initWindow(terminalHeight()-1, terminalWidth(), 0, 0)
+  if result.settings.statusBar.useBar:
+    result.statusWindow = initWindow(1, terminalWidth(), terminalHeight() - useStatusBar - 1, 0, ui.ColorPair.blackPink)
   result.commandWindow = initWindow(1, terminalWidth(), terminalHeight()-1, 0)
 
 proc writeStatusBar*(status: var EditorStatus) =
   status.statusWindow.erase
 
   if status.mode == Mode.filer:
-    status.statusWindow.write(0, 0, ru" FILER ", ui.ColorPair.blackWhite)
-    status.statusWindow.append(ru" ", ui.ColorPair.blackGreen)
-    status.statusWindow.append(getCurrentDir().toRunes, ui.ColorPair.blackGreen)
+    if status.settings.statusBar.mode: status.statusWindow.write(0, 0, ru" FILER ", ui.ColorPair.blackWhite)
+    if status.settings.statusBar.directory: status.statusWindow.append(ru" ", ui.ColorPair.blackPink)
+    status.statusWindow.append(getCurrentDir().toRunes, ui.ColorPair.blackPink)
     status.statusWindow.refresh
     return
 
-  status.statusWindow.write(0, 0,  if status.mode == Mode.normal: ru" NORMAL " else: ru" INSERT ", ui.ColorPair.blackWhite)
-  status.statusWindow.append(ru" ", ui.ColorPair.blackGreen)
-  status.statusWindow.append(if status.filename.len > 0: status.filename else: ru"No name", ui.ColorPair.blackGreen)
-  if status.countChange > 0:  status.statusWindow.append(ru" [+]", ui.ColorPair.blackGreen)
+  if status.settings.statusBar.mode: status.statusWindow.write(0, 0,  if status.mode == Mode.normal: ru" NORMAL " else: ru" INSERT ", ui.ColorPair.blackWhite)
+  status.statusWindow.append(ru" ", ui.ColorPair.blackPink)
+  if status.settings.statusBar.filename: status.statusWindow.append(if status.filename.len > 0: status.filename else: ru"No name", ui.ColorPair.blackPink)
+  if status.countChange > 0 and status.settings.statusBar.chanedMark: status.statusWindow.append(ru" [+]", ui.ColorPair.blackPink)
 
   let
-    line = fmt"{status.currentLine+1}/{status.buffer.len}"
-    column = fmt"{status.currentColumn}/{status.buffer[status.currentLine].len}"
-    encoding = $status.settings.characterEncoding
-    info = fmt"{line} {column} {encoding} "
-  status.statusWindow.write(0, terminalWidth()-info.len, info, ui.Colorpair.blackGreen)
+    line = if status.settings.statusBar.line: fmt"{status.currentLine+1}/{status.buffer.len}" else: ""
+    column = if status.settings.statusBar.column: fmt"{status.currentColumn + 1}/{status.buffer[status.currentLine].len}" else: ""
+    encoding = if status.settings.statusBar.characterEncoding: $status.settings.characterEncoding else: ""
+    language = if status.language == SourceLanguage.langNone: "Plain" else: sourceLanguageToStr[status.language]
+    info = fmt"{line} {column} {encoding} {language} "
+  status.statusWindow.write(0, terminalWidth()-info.len, info, ui.Colorpair.blackPink)
   status.statusWindow.refresh
 
 proc resize*(status: var EditorStatus, height, width: int) =
   let
     adjustedHeight = max(height, 4)
     adjustedWidth = max(width, status.view.widthOfLineNum+4)
-
-  resize(status.mainWindow, adjustedHeight-2, adjustedWidth, 0, 0)
-  resize(status.statusWindow, 1, adjustedWidth, adjustedHeight-2, 0)
+    useStatusBar = if status.settings.statusBar.useBar: 1 else: 0
+
+  resize(status.mainWindow, adjustedHeight - useStatusBar - 1, adjustedWidth, 0, 0)
+  if status.settings.statusBar.useBar: resize(status.statusWindow, 1, adjustedWidth, adjustedHeight-2, 0)
   resize(status.commandWindow, 1, adjustedWidth, adjustedHeight-1, 0)
 
   if status.mode != Mode.filer:
-    status.view.resize(status.buffer, adjustedHeight-2, adjustedWidth-status.view.widthOfLineNum-1, status.view.widthOfLineNum)
+    status.view.resize(status.buffer, adjustedHeight - useStatusBar - 1, adjustedWidth-status.view.widthOfLineNum-1, status.view.widthOfLineNum)
     status.view.seekCursor(status.buffer, status.currentLine, status.currentColumn)
 
-  writeStatusBar(status)
+  if status.settings.statusBar.useBar: writeStatusBar(status)
 
 proc erase*(status: var EditorStatus) =
   erase(status.mainWindow)
@@ -101,9 +142,9 @@ proc erase*(status: var EditorStatus) =
 
 proc update*(status: var EditorStatus) =
   setCursor(false)
-  writeStatusBar(status)
+  if status.settings.statusBar.useBar: writeStatusBar(status)
   status.view.seekCursor(status.buffer, status.currentLine, status.currentColumn)
-  status.view.update(status.mainWindow, status.buffer, status.currentLine)
+  status.view.update(status.mainWindow, status.settings.lineNumber, status.buffer, status.highlight, status.currentLine)
   status.cursor.update(status.view, status.currentLine, status.currentColumn)
   status.mainWindow.write(status.cursor.y, status.view.widthOfLineNum+status.cursor.x, "")
   status.mainWindow.refresh
@@ -112,3 +153,6 @@ proc update*(status: var EditorStatus) =
 proc changeMode*(status: var EditorStatus, mode: Mode) =
   status.prevMode = status.mode
   status.mode = mode
+
+proc executeOnExit*(settings: EditorSettings) =
+  changeCursorType(settings.defaultCursor)