Merge pull request #1458 from fox0430/fix-import

Fix import and bump nim version

moe.nimble

@@ -9,7 +9,7 @@ bin           = @["moe"]
 
 # Dependencies
 
-requires "nim >= 1.4.2"
+requires "nim >= 1.6.0"
 requires "ncurses >= 1.0.2"
 requires "unicodedb >= 0.10.0"
 requires "parsetoml >= 0.6.0"

src/moe.nim

@@ -1,4 +1,4 @@
-import os, times
+import std/[os, times]
 import moepkg/[ui, editorstatus, normalmode, insertmode, visualmode,
                replacemode, filermode, exmode, buffermanager, logviewer,
                cmdlineoption, bufferstatus, help, recentfilemode, quickrun,

src/moepkg/backup.nim

@@ -1,4 +1,4 @@
-import os, times, re
+import std/[os, times, re]
 import settings, unicodeext, fileutils, bufferstatus, gapbuffer, messages,
        commandline
 

src/moepkg/bookmark.nim

@@ -1,4 +1,4 @@
-import os
+import std/os
 
 type Bookmark* = object
   path*: string

src/moepkg/buffermanager.nim

@@ -1,4 +1,4 @@
-import terminal, os, heapqueue, times
+import std/[terminal, os, heapqueue, times]
 import gapbuffer, ui, editorstatus, unicodeext, highlight, window, movement,
        color, bufferstatus
 

src/moepkg/bufferstatus.nim

@@ -1,4 +1,4 @@
-import tables, times, options
+import std/[tables, times, options]
 import syntax/highlite
 import gapbuffer, unicodeext
 

src/moepkg/build.nim

@@ -1,4 +1,4 @@
-import os, osproc, strformat, unicode
+import std/[os, osproc, strformat, unicode]
 import syntax/highlite
 
 proc build*(filename, workspaceRoot,

src/moepkg/clipboard.nim

@@ -1,4 +1,4 @@
-import unicode, os
+import std/[unicode, os]
 import independentutils, platform, settings
 
 proc runesToStrings(runes: seq[seq[Rune]]): string =

src/moepkg/cmdlineoption.nim

@@ -1,4 +1,4 @@
-import parseopt, pegs, os, strformat
+import std/[parseopt, pegs, os, strformat]
 
 type CmdParsedList* = object
   path*: seq[string]

src/moepkg/color.nim

@@ -1,5 +1,5 @@
+import std/[strutils, tables, macros, strformat]
 import ncurses
-import strutils, tables, macros, strformat
 
 # maps annotations of the enum to a hexToColor table
 macro mapAnnotationToTable(args: varargs[untyped]): untyped =

src/moepkg/commandline.nim

@@ -1,4 +1,4 @@
-import terminal
+import std/terminal
 import ui, unicodeext, color
 
 type CommandLine* = object

src/moepkg/commandview.nim

@@ -1,4 +1,4 @@
-import terminal, strutils, sequtils, strformat, os, algorithm
+import std/[terminal, strutils, sequtils, strformat, os, algorithm]
 import ui, unicodeext, fileutils, color, commandline
 
 type ExModeViewStatus = object

src/moepkg/configmode.nim

@@ -1,4 +1,4 @@
-import terminal, times, strutils
+import std/[terminal, times, strutils]
 import gapbuffer, ui, editorstatus, unicodeext, window, movement, settings,
        bufferstatus, color, highlight, search, editor
 

src/moepkg/cursor.nim

@@ -1,4 +1,4 @@
-import deques, strformat
+import std/[deques, strformat]
 import editorview, unicodeext
 
 type CursorPosition* = object

src/moepkg/debugmode.nim

@@ -1,4 +1,4 @@
-import terminal, times, strformat, options
+import std/[terminal, times, strformat, options]
 import gapbuffer, ui, unicodeext, highlight, color, window, bufferstatus,
        movement, settings
 

src/moepkg/diffviewer.nim

@@ -1,4 +1,4 @@
-import times, terminal
+import std/[times, terminal]
 import editorstatus, unicodeext, bufferstatus, highlight, color, gapbuffer, ui,
        movement, window
 

src/moepkg/editor.nim

@@ -1,4 +1,4 @@
-import strutils, sequtils, strformat, options
+import std/[strutils, sequtils, strformat, options]
 import syntax/highlite
 import editorstatus, ui, gapbuffer, unicodeext, undoredostack, window,
        bufferstatus, movement, messages, settings, register, commandline

src/moepkg/editorstatus.nim

@@ -1,9 +1,9 @@
-import strutils, terminal, os, strformat, tables, times, heapqueue, deques,
-       options
+import std/[strutils, terminal, os, strformat, tables, times, heapqueue, deques,
+            options]
 import syntax/highlite
 import gapbuffer, editorview, ui, unicodeext, highlight, fileutils,
-       undoredostack, window, color, settings, statusline, bufferstatus, cursor,
-       tabline, backup, messages, commandline, register, platform
+       window, color, settings, statusline, bufferstatus, cursor, tabline,
+       backup, messages, commandline, register, platform
 
 # Save cursor position when a buffer for a window(file) gets closed.
 type LastPosition* = object

src/moepkg/editorview.nim

@@ -1,4 +1,4 @@
-import deques, strutils, math, strformat
+import std/[deques, strutils, math, strformat]
 import gapbuffer, ui, unicodeext, independentutils, color, settings,
        bufferstatus, highlight
 

src/moepkg/exmode.nim

@@ -1,4 +1,4 @@
-import sequtils, strutils, os, terminal, times, options
+import std/[sequtils, strutils, os, terminal, times, options]
 import syntax/highlite
 import editorstatus, ui, normalmode, gapbuffer, fileutils, editorview,
         unicodeext, independentutils, search, highlight, commandview,

src/moepkg/filermode.nim

@@ -1,6 +1,8 @@
-import os, terminal, strutils, unicodeext, times, algorithm, sequtils, options
+import std/[os, terminal, strutils, times, algorithm, sequtils,
+            options]
 import editorstatus, ui, fileutils, editorview, gapbuffer, highlight,
-       commandview, window, color, bufferstatus, settings, messages, commandline
+       commandview, window, color, bufferstatus, settings, messages,
+       commandline, unicodeext
 
 type PathInfo = tuple[kind: PathComponent,
                       path: string,
@@ -76,8 +78,8 @@ proc sortDirList(dirList: seq[PathInfo], sortBy: Sort): seq[PathInfo] =
     result.add dirList.sortedByIt(it.lastWriteTime)
 
 when defined(posix):
-  from posix import nil
-  from posix_utils import nil
+  from std/posix import nil
+  from std/posix_utils import nil
 
   proc isFifo(file: string): bool {.inline.} =
     posix.S_ISFIFO(posix_utils.stat(file).st_mode)

src/moepkg/fileutils.nim

@@ -1,4 +1,4 @@
-import os, encodings
+import std/[os, encodings]
 import gapbuffer, unicodeext
 
 proc normalizePath*(path: seq[Rune]): seq[Rune] =

src/moepkg/gapbuffer.nim

@@ -1,4 +1,4 @@
-import macros, strformat
+import std/[macros, strformat]
 import undoredostack
 export undoredostack
 

src/moepkg/generalautocomplete.nim

@@ -1,4 +1,4 @@
-import sugar, critbits, options
+import std/[sugar, critbits, options]
 import unicodedb/properties
 import unicodeext, bufferstatus
 

src/moepkg/help.nim

@@ -1,4 +1,4 @@
-import terminal
+import std/[terminal]
 import editorstatus, bufferstatus, ui, movement, unicodeext, gapbuffer, window
 
 const helpsentences = """

src/moepkg/highlight.nim

@@ -1,7 +1,7 @@
-import sequtils, os, strformat, parseutils
+import std/[sequtils, os, strformat, parseutils]
 import syntax/highlite
 import unicodeext, color
-from strutils import find
+from std/strutils import find
 
 type ColorSegment* = object
   firstRow*, firstColumn*, lastRow*, lastColumn*: int

src/moepkg/historymanager.nim

@@ -1,6 +1,6 @@
 # History manager for automatic backup.
 
-import re, os, times, terminal, osproc
+import std/[re, os, times, terminal, osproc]
 import editorstatus, bufferstatus, unicodeext, ui, movement, gapbuffer,
        highlight, color, settings, messages, backup, commandview, fileutils,
        editorview, window

src/moepkg/independentutils.nim

@@ -1,4 +1,4 @@
-import strutils, math, random, osproc
+import std/[strutils, math, random, osproc]
 
 proc numberOfDigits*(x: int): int {.inline.} = x.intToStr.len
 

src/moepkg/insertmode.nim

@@ -1,4 +1,4 @@
-import terminal, times, options, unicode
+import std/[terminal, times, options, unicode]
 import ui, editorstatus, gapbuffer, window, movement, editor, bufferstatus,
        suggestionwindow, settings
 

src/moepkg/logviewer.nim

@@ -1,4 +1,4 @@
-import terminal, times
+import std/[terminal, times]
 import ui, editorstatus, unicodeext, movement, bufferstatus, window
 
 proc exitLogViewer*(status: var Editorstatus, height, width: int) {.inline.} =

src/moepkg/messages.nim

@@ -1,4 +1,4 @@
-import strformat, os, strutils
+import std/[strformat, os, strutils]
 import color, unicodeext, settings, commandline, independentutils
 
 proc writeMessageOnCommandWindow*(commandLine: var CommandLine,

src/moepkg/movement.nim

@@ -1,4 +1,4 @@
-import deques
+import std/deques
 import editorstatus, ui, editorview, gapbuffer, unicodeext, window, bufferstatus
 
 template currentLineLen: int = bufStatus.buffer[windowNode.currentLine].len

src/moepkg/normalmode.nim

@@ -1,4 +1,4 @@
-import terminal, times, strutils
+import std/[terminal, times, strutils]
 import editorstatus, ui, gapbuffer, unicodeext, fileutils, undoredostack,
        window, movement, editor, search, bufferstatus, quickrun,
        messages

src/moepkg/platform.nim

@@ -1,4 +1,4 @@
-import osproc, strutils
+import std/[osproc, strutils]
 
 type Platforms* = enum
   linux, wsl, mac, freebsd, openbsd, other

src/moepkg/quickrun.nim

@@ -1,4 +1,4 @@
-import osproc, terminal, times
+import std/[osproc, terminal, times]
 import syntax/highlite
 import unicodeext, settings, bufferstatus, gapbuffer, messages, ui,
        editorstatus, movement, window, fileutils, commandline

src/moepkg/recentfilemode.nim

@@ -1,4 +1,4 @@
-import os, re, terminal
+import std/[os, re, terminal]
 import editorstatus, ui, unicodeext, bufferstatus, movement, gapbuffer,
        messages, window
 

src/moepkg/register.nim

@@ -1,4 +1,4 @@
-import options, strutils, unicode
+import std/[options, strutils, unicode]
 import independentutils, clipboard, settings
 
 type Register* = object

src/moepkg/replacemode.nim

@@ -1,4 +1,4 @@
-import terminal, times, unicode
+import std/[terminal, times, unicode]
 import editorstatus, ui, movement, editor, bufferstatus, gapbuffer,
        window, settings
 

src/moepkg/search.nim

@@ -1,4 +1,4 @@
-import system, terminal, strutils
+import std/[terminal, strutils]
 import editorstatus, gapbuffer, commandview, movement, commandline, unicodeext
 
 type

src/moepkg/settings.nim

@@ -1,7 +1,9 @@
-import parsetoml, os, json, macros, times, options, strformat, osproc, strutils
-export TomlError
-
+import std/[os, json, macros, times, options, strformat, osproc,
+            strutils]
 import ui, color, unicodeext, highlight, platform, independentutils
+import parsetoml
+
+export TomlError
 
 type DebugWindowNodeSettings* = object
   enable*: bool

src/moepkg/statusline.nim

@@ -1,6 +1,6 @@
-import ui, strutils, strformat, os, osproc
+import std/[strutils, strformat, os, osproc]
 import syntax/highlite
-import bufferstatus, color, unicodeext, settings, window, gapbuffer
+import ui, bufferstatus, color, unicodeext, settings, window, gapbuffer
 
 type StatusLine* = object
   window*: Window

src/moepkg/suggestionwindow.nim

@@ -1,4 +1,4 @@
-import critbits, sugar, options, sequtils, unicode
+import std/[critbits, sugar, options, sequtils, unicode]
 import ui, window, generalautocomplete, bufferstatus, gapbuffer, color,
        editorstatus
 

src/moepkg/syntax/highlite.nim

@@ -65,8 +65,8 @@
 ##
 
 import
-  strutils
-from algorithm import binarySearch
+  std/strutils
+from std/algorithm import binarySearch
 
 type
   TokenClass* = enum

src/moepkg/syntax/syntaxnim.nim

@@ -31,8 +31,8 @@
 #    distribution, for details about the copyright.
 #
 
-import strutils
-from algorithm import binarySearch
+import std/strutils
+from std/algorithm import binarySearch
 
 import highlite
 

src/moepkg/tabline.nim

@@ -1,4 +1,4 @@
-import strutils, terminal, unicode
+import std/[strutils, terminal, unicode]
 import ui, window, color, bufferstatus, independentutils
 
 proc writeTab*(tabWin: var Window,

src/moepkg/ui.nim

@@ -1,8 +1,8 @@
-import strformat, osproc, strutils
+import std/[strformat, osproc, strutils]
 when not defined unitTest:
-  import posix
+  import std/posix
 
-from os import execShellCmd
+from std/os import execShellCmd
 import ncurses
 import unicodeext, color
 

src/moepkg/undoredostack.nim

@@ -1,4 +1,4 @@
-import sequtils, tables
+import std/[sequtils, tables]
 
 type
   CommandKind = enum

src/moepkg/unicodeext.nim

@@ -1,4 +1,4 @@
-import unicode, sequtils, strutils, strformat, os
+import std/[unicode, sequtils, strutils, strformat, os]
 import unicodedb/widths
 import gapbuffer
 export unicode

src/moepkg/visualmode.nim

@@ -1,4 +1,4 @@
-import terminal, strutils, sequtils, times
+import std/[terminal, strutils, sequtils, times]
 import editorstatus, ui, gapbuffer, unicodeext, window, movement, editor,
        bufferstatus, settings, register, messages, commandline
 

src/moepkg/window.nim

@@ -1,4 +1,4 @@
-import heapqueue, options
+import std/[heapqueue, options]
 import ui, editorview, gapbuffer, color, cursor, highlight, unicodeext
 
 # vertical is default

tests/tbackup.nim

@@ -1,4 +1,4 @@
-import unittest, times, os
+import std/[unittest, times, os]
 import moepkg/unicodeext
 include moepkg/backup
 

tests/tclipboard.nim

@@ -1,4 +1,4 @@
-import unittest
+import std/unittest
 import moepkg/[settings, unicodeext, register, clipboard]
 include moepkg/[platform]
 

tests/tcommandview.nim

@@ -1,4 +1,4 @@
-import unittest, os, strutils
+import std/[unittest, os, strutils]
 import moepkg/[editorstatus, unicodeext]
 include moepkg/commandview
 

tests/tconfigmode.nim

@@ -1,4 +1,4 @@
-import unittest, macros, strformat
+import std/[unittest, macros, strformat]
 import moepkg/[editorstatus, gapbuffer, bufferstatus, unicodeext]
 
 include moepkg/configmode

tests/tdebugmode.nim

@@ -1,4 +1,4 @@
-import unittest, strformat
+import std/[unittest, strformat]
 import moepkg/[editorstatus, unicodeext, bufferstatus]
 
 include moepkg/debugmode

tests/teditor.nim

@@ -1,4 +1,4 @@
-import unittest, macros
+import std/[unittest, macros]
 import moepkg/register
 include moepkg/[editor, editorstatus, ui, platform]