1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-08-17 12:40:22 +03:00

Compare commits

...

7 Commits

Author SHA1 Message Date
Tae Won Ha
122a1f0a1a
Extend gitignore 2024-06-30 21:24:44 +02:00
Tae Won Ha
3180a2fffb
Remove Package.resolved 2024-06-30 21:24:22 +02:00
Tae Won Ha
b4379adda2
Update appcast 2024-06-30 15:58:46 +02:00
Tae Won Ha
398508f8ed
Bump version to v0.47.5-20240630.155444 2024-06-30 15:54:44 +02:00
Tae Won Ha
8f2a5e38fc
Update release notes 2024-06-30 15:53:22 +02:00
Tae Won Ha
4a6adfdb6b
Merge pull request #1078 from shanesmith/fix-non-global-cd
Fix lcd/tcd
2024-06-30 15:52:14 +02:00
Shane Smith
0c0a215202 Fix lcd/tcd
The following code path effectively turned any `lcd` or `tcd` into a
`cd`.

- `lcd` (or `tcd`) from nvim
- handled by `DirChanged` autocmd from NvimView.swift
- fires `.dirchanged` event
- handled by autoCommandEvent() in NvimView+UiBridge.swift
- calls cwdChanged() in NvimView+UiBridge.swift
- fires event `.cwdChanged`
- handled by `subscribeToNvimViewEvents()` in MainWindow.swift
- calls `cwdChanged()` in MainWindow+Delegates.swift
- fires even `.cd`
- handled by `typedReduce()` in MainWindowReducer.swift
- sets `state.cwdToSet`
- state change handled by `subscribeToStateChange()` in MainWindow.swift
- sets `self.neoVimView.cwd`
- handled by `var cwd` setter in NvimView.swift
- calls `nvimSetCurrentDir()` which sets global nvim cwd

This chain had to be broken somewhere. The `state.cwdToSet` line in
MainWindowReducer.swift has a comment that it's set to "ensure updates
also send to tab bar". To fix we remove that line and instead set the
tab bar cwd earlier in the cahin in NvimView+UiBridge.swift.

I don't normally use the custom tab bar or file browser, but have tested
them with this change and they seem to still work well.

Fixes #1027
2024-06-29 21:24:44 -04:00
10 changed files with 30 additions and 175 deletions

1
.gitignore vendored
View File

@ -185,3 +185,4 @@ tags.*
/Workspace/.swiftpm
.swiftpm
/NvimServer/.build
Package.resolved

View File

@ -508,6 +508,7 @@ extension NvimView {
self.bridgeLogger.debug(cwd)
self._cwd = URL(fileURLWithPath: cwd)
self.tabBar?.cwd = cwd
self.eventsSubject.onNext(.cwdChanged)
}

View File

@ -1,140 +0,0 @@
{
"pins" : [
{
"identity" : "cwlcatchexception",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattgallagher/CwlCatchException.git",
"state" : {
"revision" : "3b123999de19bf04905bc1dfdb76f817b0f2cc00",
"version" : "2.1.2"
}
},
{
"identity" : "cwlpreconditiontesting",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git",
"state" : {
"revision" : "2ef56b2caf25f55fa7eef8784c30d5a767550f54",
"version" : "2.2.1"
}
},
{
"identity" : "dictionarycoding",
"kind" : "remoteSourceControl",
"location" : "https://github.com/elegantchaos/DictionaryCoding",
"state" : {
"revision" : "ae19e456bd550fed8f341e5bae4318333c53a5b4",
"version" : "1.0.9"
}
},
{
"identity" : "down",
"kind" : "remoteSourceControl",
"location" : "https://github.com/johnxnguyen/Down",
"state" : {
"revision" : "f34b166be1f1db4aa8f573067e901d72f2a6be57",
"version" : "0.11.0"
}
},
{
"identity" : "fsevents",
"kind" : "remoteSourceControl",
"location" : "https://github.com/qvacua/FSEvents",
"state" : {
"branch" : "release-fseventstream",
"revision" : "90ed674df15b5e546a061052dad70228b3300fba"
}
},
{
"identity" : "material-icons",
"kind" : "remoteSourceControl",
"location" : "https://github.com/qvacua/material-icons",
"state" : {
"revision" : "c3db645060fd27df5f7e0a9873c2af22c280725e",
"version" : "0.1.0"
}
},
{
"identity" : "messagepack.swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/a2/MessagePack.swift",
"state" : {
"revision" : "27b35fd49e92fcae395bf8ccb233499d89cc7890",
"version" : "4.0.0"
}
},
{
"identity" : "misc.swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/qvacua/misc.swift",
"state" : {
"revision" : "7edc70087f16fdc411d24b0fe726e55f9d65d982",
"version" : "0.2.0"
}
},
{
"identity" : "nimble",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Quick/Nimble",
"state" : {
"revision" : "1c49fc1243018f81a7ea99cb5e0985b00096e9f4",
"version" : "13.3.0"
}
},
{
"identity" : "purelayout",
"kind" : "remoteSourceControl",
"location" : "https://github.com/PureLayout/PureLayout",
"state" : {
"revision" : "5561683c96dc49b023c1299bfe4f6fbeed5f8199",
"version" : "3.1.9"
}
},
{
"identity" : "rxswift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ReactiveX/RxSwift",
"state" : {
"revision" : "b06a8c8596e4c3e8e7788e08e720e3248563ce6a",
"version" : "6.7.1"
}
},
{
"identity" : "shortcutrecorder",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Kentzo/ShortcutRecorder",
"state" : {
"revision" : "c86ce0f9be5353ba998966121c7631602a9a36f7",
"version" : "3.4.0"
}
},
{
"identity" : "sparkle",
"kind" : "remoteSourceControl",
"location" : "https://github.com/sparkle-project/Sparkle",
"state" : {
"revision" : "b456fd404954a9e13f55aa0c88cd5a40b8399638",
"version" : "2.6.3"
}
},
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections.git",
"state" : {
"revision" : "ee97538f5b81ae89698fd95938896dec5217b148",
"version" : "1.1.1"
}
},
{
"identity" : "swifter",
"kind" : "remoteSourceControl",
"location" : "https://github.com/httpswift/swifter",
"state" : {
"revision" : "9483a5d459b45c3ffd059f7b55f9638e268632fd",
"version" : "1.5.0"
}
}
],
"version" : 2
}

View File

@ -1126,7 +1126,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 20240626.190016;
CURRENT_PROJECT_VERSION = 20240630.155444;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_MODULE_VERIFIER = YES;
@ -1192,7 +1192,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 20240626.190016;
CURRENT_PROJECT_VERSION = 20240630.155444;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_MODULE_VERIFIER = YES;
@ -1225,7 +1225,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20240626.190016;
CURRENT_PROJECT_VERSION = 20240630.155444;
DEFINES_MODULE = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
IBC_MODULE = VimR;
@ -1250,7 +1250,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20240626.190016;
CURRENT_PROJECT_VERSION = 20240630.155444;
DEFINES_MODULE = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
IBC_MODULE = VimR;

View File

@ -1224,7 +1224,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.47.4</string>
<string>0.47.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -1241,7 +1241,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>20240626.190016</string>
<string>20240630.155444</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

View File

@ -19,7 +19,6 @@ final class MainWindowReducer: ReducerType {
case let .cd(to: cwd):
if state.cwd != cwd {
state.cwd = cwd
state.cwdToSet = cwd // Ensure updates also pend to tab bar
}
case let .setBufferList(buffers):

View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.47.4</string>
<string>0.47.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>20240626.190016</string>
<string>20240630.155444</string>
</dict>
</plist>

View File

@ -6,27 +6,22 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.47.4-20240626.190016</title>
<title>v0.47.5-20240630.155444</title>
<link>https://twitter.com/vimrefined</link>
<sparkle:version>20240626.190016</sparkle:version>
<sparkle:shortVersionString>v0.47.4</sparkle:shortVersionString>
<sparkle:version>20240630.155444</sparkle:version>
<sparkle:shortVersionString>v0.47.5</sparkle:shortVersionString>
<description><![CDATA[
<ul>
<li>GH-1075: Fix "E1502: Lua failed to grow stack to 4001". Thanks @shanesmith for the PR!</li>
<li>Dependencies updates:<ul>
<li>sparkle-project/Sparkle@2.7.3</li>
<li>apple/swift-collections@1.1.1</li>
</ul>
</li>
<li>GH-1078: Fix lcd/tcd. Thanks @shanesmith for the PR!</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.47.4-20240626.190016
https://github.com/qvacua/vimr/releases/tag/v0.47.5-20240630.155444
</releaseNotesLink>
<pubDate>2024-06-26T19:04:00.452614</pubDate>
<pubDate>2024-06-30T15:58:45.910474</pubDate>
<minimumSystemVersion>12.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.47.4-20240626.190016/VimR-v0.47.4.tar.bz2"
sparkle:edSignature="YWqNsLlttqQjp5Zv3VQgCW6O7rx4iqUb+wFMwzVVC8ymmUg1WgJ0MY0VKOGiUdos8Ll9y6FjYeJQ2sZSsHQXAA==" length="19392062"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.47.5-20240630.155444/VimR-v0.47.5.tar.bz2"
sparkle:edSignature="d79xsvHtk3WVnhSIUfrFZahoR5t/1DYSD/dEyWcpd4muMbyc0r4Cl11QYlIv7D4pcoMtwYzNUVNglRQtJ2e4DQ==" length="19386898"
type="application/octet-stream"/>
</item>
</channel>

View File

@ -6,27 +6,22 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.47.4-20240626.190016</title>
<title>v0.47.5-20240630.155444</title>
<link>https://twitter.com/vimrefined</link>
<sparkle:version>20240626.190016</sparkle:version>
<sparkle:shortVersionString>v0.47.4</sparkle:shortVersionString>
<sparkle:version>20240630.155444</sparkle:version>
<sparkle:shortVersionString>v0.47.5</sparkle:shortVersionString>
<description><![CDATA[
<ul>
<li>GH-1075: Fix "E1502: Lua failed to grow stack to 4001". Thanks @shanesmith for the PR!</li>
<li>Dependencies updates:<ul>
<li>sparkle-project/Sparkle@2.7.3</li>
<li>apple/swift-collections@1.1.1</li>
</ul>
</li>
<li>GH-1078: Fix lcd/tcd. Thanks @shanesmith for the PR!</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.47.4-20240626.190016
https://github.com/qvacua/vimr/releases/tag/v0.47.5-20240630.155444
</releaseNotesLink>
<pubDate>2024-06-26T19:04:00.452614</pubDate>
<pubDate>2024-06-30T15:58:45.910474</pubDate>
<minimumSystemVersion>12.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.47.4-20240626.190016/VimR-v0.47.4.tar.bz2"
sparkle:edSignature="YWqNsLlttqQjp5Zv3VQgCW6O7rx4iqUb+wFMwzVVC8ymmUg1WgJ0MY0VKOGiUdos8Ll9y6FjYeJQ2sZSsHQXAA==" length="19392062"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.47.5-20240630.155444/VimR-v0.47.5.tar.bz2"
sparkle:edSignature="d79xsvHtk3WVnhSIUfrFZahoR5t/1DYSD/dEyWcpd4muMbyc0r4Cl11QYlIv7D4pcoMtwYzNUVNglRQtJ2e4DQ==" length="19386898"
type="application/octet-stream"/>
</item>
</channel>

View File

@ -1,5 +1,9 @@
# Next
* GH-1078: Fix lcd/tcd. Thanks @shanesmith for the PR!
# 0.47.4-20240626.190016
* GH-1075: Fix "E1502: Lua failed to grow stack to 4001". Thanks @shanesmith for the PR!
* Dependencies updates:
- sparkle-project/Sparkle@2.7.3