qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-11-24 11:37:32 +03:00
Code Issues Projects Releases Wiki Activity

GH-666 Use file logger

Browse Source
This commit is contained in:
Tae Won Ha 2018-10-04 21:40:59 +02:00
parent 26f85a8607
commit c8ff46e328
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
NvimView/NvimView/NvimView+Key.swift
View File

@ -22,7 +22,7 @@ extension NvimView {
let cocoaHandledEvent let cocoaHandledEvent
= NSTextInputContext.current?.handleEvent(event) ?? false = NSTextInputContext.current?.handleEvent(event) ?? false
if self.keyDownDone && cocoaHandledEvent { if self.keyDownDone && cocoaHandledEvent {
stdoutLogger.debug("returning: key down done and cocoa handled event") logger.debug("returning: key down done and cocoa handled event")
return return
} }
} }
@ -52,7 +52,7 @@ extension NvimView {
} }
public func insertText(_ object: Any, replacementRange: NSRange) { public func insertText(_ object: Any, replacementRange: NSRange) {
stdoutLogger.debug("\(object) with \(replacementRange)") logger.debug("\(object) with \(replacementRange)")
let text: String let text: String
switch object { switch object {
@ -92,14 +92,14 @@ extension NvimView {
public override func doCommand(by aSelector: Selector) { public override func doCommand(by aSelector: Selector) {
if self.responds(to: aSelector) { if self.responds(to: aSelector) {
stdoutLogger.debug("calling \(aSelector)") logger.debug("calling \(aSelector)")
self.perform(aSelector, with: self) self.perform(aSelector, with: self)
self.keyDownDone = true self.keyDownDone = true
return return
} }
stdoutLogger.debug("\(aSelector) not implemented, " + logger.debug("\(aSelector) not implemented, " +
"forwarding input to neovim") "forwarding input to neovim")
self.keyDownDone = false self.keyDownDone = false
} }
@ -163,7 +163,7 @@ extension NvimView {
selectedRange: NSRange, selectedRange: NSRange,
replacementRange: NSRange replacementRange: NSRange
) { ) {
stdoutLogger.debug("object: \(object), selectedRange: \(selectedRange), " + logger.debug("object: \(object), selectedRange: \(selectedRange), " +
"replacementRange: \(replacementRange)") "replacementRange: \(replacementRange)")
defer { self.keyDownDone = true } defer { self.keyDownDone = true }
@ -192,12 +192,12 @@ extension NvimView {
self.markedPosition = newMarkedPosition self.markedPosition = newMarkedPosition
stdoutLogger.debug("Deleting \(replacementRange.length) " + logger.debug("Deleting \(replacementRange.length) " +
"and inputting \(self.markedText!)") "and inputting \(self.markedText!)")
try? self.bridge.deleteCharacters(replacementRange.length, try? self.bridge.deleteCharacters(replacementRange.length,
input: self.markedText!).wait() input: self.markedText!).wait()
} else { } else {
stdoutLogger.debug("Deleting \(oldMarkedTextLength) " + logger.debug("Deleting \(oldMarkedTextLength) " +
"and inputting \(self.markedText!)") "and inputting \(self.markedText!)")
try? self.bridge.deleteCharacters(oldMarkedTextLength, try? self.bridge.deleteCharacters(oldMarkedTextLength,
input: self.markedText!).wait() input: self.markedText!).wait()
@ -207,7 +207,7 @@ extension NvimView {
} }
public func unmarkText() { public func unmarkText() {
stdoutLogger.mark() logger.mark()
let position = self.markedPosition let position = self.markedPosition
self.ugrid.unmarkCell(at: position) self.ugrid.unmarkCell(at: position)
@ -232,7 +232,7 @@ extension NvimView {
// When the app starts and the Hangul input method is selected, // When the app starts and the Hangul input method is selected,
// this method gets called very early... // this method gets called very early...
guard self.ugrid.hasData else { guard self.ugrid.hasData else {
stdoutLogger.debug("No data in UGrid!") logger.debug("No data in UGrid!")
return .notFound return .notFound
} }
@ -244,13 +244,13 @@ extension NvimView {
length: 0 length: 0
) )
stdoutLogger.debug("Returning \(result)") logger.debug("Returning \(result)")
return result return result
} }
public func markedRange() -> NSRange { public func markedRange() -> NSRange {
guard let marked = self.markedText else { guard let marked = self.markedText else {
stdoutLogger.debug("No marked text, returning not found") logger.debug("No marked text, returning not found")
return .notFound return .notFound
} }
@ -259,7 +259,7 @@ extension NvimView {
length: marked.count length: marked.count
) )
stdoutLogger.debug("Returning \(result)") logger.debug("Returning \(result)")
return result return result
} }
@ -272,7 +272,7 @@ extension NvimView {
actualRange: NSRangePointer? actualRange: NSRangePointer?
) -> NSAttributedString? { ) -> NSAttributedString? {
stdoutLogger.debug("\(aRange)") logger.debug("\(aRange)")
if aRange.location == NSNotFound { if aRange.location == NSNotFound {
return nil return nil
} }
@ -288,7 +288,7 @@ extension NvimView {
return nil return nil
} }
stdoutLogger.debug("\(position) ... \(inclusiveEndPosition)") logger.debug("\(position) ... \(inclusiveEndPosition)")
let string = self.ugrid.cells[position.row...inclusiveEndPosition.row] let string = self.ugrid.cells[position.row...inclusiveEndPosition.row]
.map { row in .map { row in
row.filter { cell in row.filter { cell in
@ -302,10 +302,10 @@ extension NvimView {
let delta = aRange.length - string.utf16.count let delta = aRange.length - string.utf16.count
if delta != 0 { if delta != 0 {
stdoutLogger.debug("delta = \(delta)!") logger.debug("delta = \(delta)!")
} }
stdoutLogger.debug("returning '\(string)'") logger.debug("returning '\(string)'")
return NSAttributedString(string: string) return NSAttributedString(string: string)
} }
@ -322,7 +322,7 @@ extension NvimView {
return CGRect.zero return CGRect.zero
} }
stdoutLogger.debug("\(aRange)-> \(position.row):\(position.column)") logger.debug("\(aRange)-> \(position.row):\(position.column)")
let resultInSelf = self.rect(forRow: position.row, column: position.column) let resultInSelf = self.rect(forRow: position.row, column: position.column)
let result = self.window?.convertToScreen( let result = self.window?.convertToScreen(
@ -336,7 +336,7 @@ extension NvimView {
let position = self.position(at: aPoint) let position = self.position(at: aPoint)
let result = self.ugrid.flatCharIndex(forPosition: position) let result = self.ugrid.flatCharIndex(forPosition: position)
stdoutLogger.debug("\(aPoint) -> \(position) -> \(result)") logger.debug("\(aPoint) -> \(position) -> \(result)")
return result return result
} }