qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-26 23:36:08 +03:00
Code Issues Projects Releases Wiki Activity

remove warnings

Browse Source
This commit is contained in:
George Harker 2023-11-12 10:00:47 -08:00
parent 3d1bb76165
commit 5c045c49aa
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Commons/Sources/Commons/FileUtils.swift
View File

@ -3,7 +3,9 @@
* See LICENSE
*/
import AppKit
import Cocoa
import UniformTypeIdentifiers
private let workspace = NSWorkspace.shared
private let iconsCache = NSCache<NSURL, NSImage>()
@ -59,7 +61,7 @@ public final class FileUtils {
return possibleParent.hasDirectoryPath ? possibleParent : possibleParent.parent
}
public static func icon(forType type: String) -> NSImage { workspace.icon(forFileType: type) }
public static func icon(forType type: String) -> NSImage { workspace.icon(for: UTType(type) ?? UTType.text) }
public static func icon(forUrl url: URL) -> NSImage? {
if let cached = iconsCache.object(forKey: url as NSURL) { return cached }

2
NvimView/Sources/NvimView/NvimView+Mouse.swift
View File

@ -112,7 +112,7 @@ public extension NvimView {
})
.disposed(by: self.disposeBag)
}
.subscribe(onError: { [weak self] error in
.subscribe(onFailure: { [weak self] error in
self?.log.error("Error in \(#function): \(error)")
})
.disposed(by: self.disposeBag)

4
NvimView/Sources/NvimView/NvimView+RemoteOptions.swift
View File

@ -58,10 +58,10 @@ extension NvimView {
switch option {
case let .guifont(fontSpec):
command = self.api.setOption(name: "guifont", value: .string(fontSpec))
command = self.api.setOptionValue(name: "guifont", value: .string(fontSpec), opts: ["scope": .string("global")])
case let .guifontWide(fontSpec):
command = self.api.setOption(name: "guifontwide", value: .string(fontSpec))
command = self.api.setOptionValue(name: "guifontwide", value: .string(fontSpec), opts: ["scope": .string("global")])
}
command

21
NvimView/Sources/NvimView/NvimView+UiBridge.swift
View File

@ -38,7 +38,7 @@ extension NvimView {
return
}
guard let grid = array[0].intValue,
guard let _ /* grid */ = array[0].intValue,
let width = array[1].intValue,
let height = array[2].intValue
else {
@ -80,7 +80,7 @@ extension NvimView {
guard let mainTuple = value.arrayValue,
mainTuple.count == 2,
let modeName = mainTuple[0].stringValue,
let modeIndex = mainTuple[1].uintValue
let _ /* modeIndex */ = mainTuple[1].uintValue
else {
self.bridgeLogger.error("Could not convert \(value)")
return
@ -204,7 +204,7 @@ extension NvimView {
break
case "grid_cursor_goto":
guard let grid = innerArray[0].uintValue,
guard let _ /* grid */ = innerArray[0].uintValue,
let row = innerArray[1].uintValue,
let col = innerArray[2].uintValue
else { return }
@ -408,7 +408,7 @@ extension NvimView {
return Int.max
}
guard let grid = data[0].intValue,
guard let _ /* grid */ = data[0].intValue,
let row = data[1].intValue,
let startCol = data[2].intValue,
let chunk = data[3].arrayValue?.compactMap({
@ -432,7 +432,8 @@ extension NvimView {
}
return UUpdate(string: string, attrId: attrId, repeats: repeats)
}),
let wrap = data[4].boolValue
// FIXME: implement wrap
let _ /* wrap */ = data[4].boolValue
else {
self.bridgeLogger.error("Could not convert \(data)")
return Int.max
@ -516,7 +517,7 @@ extension NvimView {
private func doScrollNu(_ array: [Int]) -> Int {
self.bridgeLogger.trace("[grid, top, bot, left, right, rows, cols] = \(array)")
let (grid, top, bottom, left, right, rows, cols)
let (_ /* grid */, top, bottom, left, right, rows, cols)
= (array[0], array[1], array[2] - 1, array[3], array[4] - 1, array[5], array[6])
let scrollRegion = Region(
@ -680,8 +681,8 @@ extension NvimView {
guard let id = array[0].intValue,
let rgb_dict = array[1].dictionaryValue,
let cterm_dict = array[2].dictionaryValue,
let info = array[3].arrayValue
let _ /* cterm_dict */ = array[2].dictionaryValue,
let _ /* info */ = array[3].arrayValue
else {
self.bridgeLogger.error(
"Could not get highlight attributes from " +
@ -730,8 +731,8 @@ extension NvimView {
guard let rgb_fg = array[0].intValue,
let rgb_bg = array[1].intValue,
let rgb_sp = array[2].intValue,
let cterm_fg = array[3].intValue,
let cterm_bg = array[4].intValue
let _ /* cterm_fg */ = array[3].intValue,
let _ /* cterm_bg */ = array[4].intValue
else {
self.bridgeLogger.error(
"Could not get default colors from " +