qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-25 14:52:19 +03:00
Code Issues Projects Releases Wiki Activity

GH-339 Rename wrapper

Browse Source
This commit is contained in:
Tae Won Ha 2017-01-06 10:31:45 +01:00
parent 9233a07b7b
commit 2014963689
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
7 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NeoVimServer/DataWrapper.h Normal file
View File

@ -0,0 +1,14 @@
/**
* Tae Won Ha - http://taewon.de - @hataewon
* See LICENSE
*/
@import Foundation;
@interface DataWrapper : NSObject
@property (strong) NSData *data;
@property (getter=isDataReady) bool dataReady;
@end

9
NeoVimServer/DataWrapper.m Normal file
View File

@ -0,0 +1,9 @@
/**
* Tae Won Ha - http://taewon.de - @hataewon
* See LICENSE
*/
#import "DataWrapper.h"
@implementation DataWrapper { } @end

4
NeoVimServer/NeoVimServer.m
View File

@ -7,7 +7,7 @@
#import "server_globals.h" #import "server_globals.h"
#import "Logging.h" #import "Logging.h"
#import "CocoaCategories.h" #import "CocoaCategories.h"
#import "Wrapper.h" #import "DataWrapper.h"
// FileInfo and Boolean are #defined by Carbon and NeoVim: Since we don't need the Carbon versions of them, we rename // FileInfo and Boolean are #defined by Carbon and NeoVim: Since we don't need the Carbon versions of them, we rename
// them. // them.
@ -40,7 +40,7 @@ static CFDataRef null_data_async(CFDataRef data, argv_callback cb) {
} }
static CFDataRef data_sync(CFDataRef data, NSCondition *condition, argv_callback cb) { static CFDataRef data_sync(CFDataRef data, NSCondition *condition, argv_callback cb) {
Wrapper *wrapper = [[Wrapper alloc] init]; DataWrapper *wrapper = [[DataWrapper alloc] init];
NSDate *deadline = [[NSDate date] dateByAddingTimeInterval:qTimeout]; NSDate *deadline = [[NSDate date] dateByAddingTimeInterval:qTimeout];
[condition lock]; [condition lock];

14
NeoVimServer/Wrapper.h
View File

@ -1,14 +0,0 @@
//
// Created by Tae Won Ha on 1/5/17.
// Copyright (c) 2017 Tae Won Ha. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface Wrapper : NSObject
@property (strong) NSData *data;
@property (getter=isDataReady) bool dataReady;
@end

12
NeoVimServer/Wrapper.m
View File

@ -1,12 +0,0 @@
//
// Created by Tae Won Ha on 1/5/17.
// Copyright (c) 2017 Tae Won Ha. All rights reserved.
//
#import "Wrapper.h"
@implementation Wrapper {
}
@end

4
NeoVimServer/server_ui.m
View File

@ -13,7 +13,7 @@
#import "NeoVimWindow.h" #import "NeoVimWindow.h"
#import "NeoVimTab.h" #import "NeoVimTab.h"
#import "CocoaCategories.h" #import "CocoaCategories.h"
#import "Wrapper.h" #import "DataWrapper.h"
// FileInfo and Boolean are #defined by Carbon and NeoVim: Since we don't need the Carbon versions of them, we rename // FileInfo and Boolean are #defined by Carbon and NeoVim: Since we don't need the Carbon versions of them, we rename
// them. // them.
@ -520,7 +520,7 @@ static void work_and_write_data_sync(void **argv, work_block block) {
[outputCondition lock]; [outputCondition lock];
NSData *data = argv[0]; NSData *data = argv[0];
Wrapper *wrapper = argv[2]; DataWrapper *wrapper = argv[2];
wrapper.data = block(data); wrapper.data = block(data);
wrapper.dataReady = YES; wrapper.dataReady = YES;
[data release]; // retained in local_server_callback [data release]; // retained in local_server_callback

12
VimR.xcodeproj/project.pbxproj
View File

@ -9,7 +9,7 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
1929B0E0C3BC59F52713D5A2 /* FoundationCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B9AF20D7BD6E5C975128 /* FoundationCommons.swift */; }; 1929B0E0C3BC59F52713D5A2 /* FoundationCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B9AF20D7BD6E5C975128 /* FoundationCommons.swift */; };
1929B165820D7177743B537A /* Component.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B39DA7AC4A9B62D7CD39 /* Component.swift */; }; 1929B165820D7177743B537A /* Component.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B39DA7AC4A9B62D7CD39 /* Component.swift */; };
1929B18A0D7C7407C51DB642 /* Wrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB6CFF4CC0B5E8B00C62 /* Wrapper.m */; }; 1929B18A0D7C7407C51DB642 /* DataWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB6CFF4CC0B5E8B00C62 /* DataWrapper.m */; };
1929B1E05C116514C1D3A384 /* CocoaCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B5C3F2F1CA4113DABFFD /* CocoaCategories.m */; }; 1929B1E05C116514C1D3A384 /* CocoaCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B5C3F2F1CA4113DABFFD /* CocoaCategories.m */; };
1929B3CEE0C1A1850E9CCE2F /* BasicTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B2FBE11048569391E092 /* BasicTypes.swift */; }; 1929B3CEE0C1A1850E9CCE2F /* BasicTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B2FBE11048569391E092 /* BasicTypes.swift */; };
1929B3F5743967125F357C9F /* Matcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BEEB33113B0E33C3830F /* Matcher.swift */; }; 1929B3F5743967125F357C9F /* Matcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BEEB33113B0E33C3830F /* Matcher.swift */; };
@ -266,7 +266,7 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
1929B0EEBE4A765934AF8335 /* Wrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Wrapper.h; sourceTree = "<group>"; }; 1929B0EEBE4A765934AF8335 /* DataWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataWrapper.h; sourceTree = "<group>"; };
1929B15B7EDC9B0F40E5E95C /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = "<group>"; }; 1929B15B7EDC9B0F40E5E95C /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = "<group>"; };
1929B1A51F076E088EF4CCA4 /* server_globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = server_globals.h; sourceTree = "<group>"; }; 1929B1A51F076E088EF4CCA4 /* server_globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = server_globals.h; sourceTree = "<group>"; };
1929B2FBE11048569391E092 /* BasicTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicTypes.swift; sourceTree = "<group>"; }; 1929B2FBE11048569391E092 /* BasicTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicTypes.swift; sourceTree = "<group>"; };
@ -284,7 +284,7 @@
1929BA6128BFDD54CA92F46E /* ColorUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorUtils.swift; sourceTree = "<group>"; }; 1929BA6128BFDD54CA92F46E /* ColorUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorUtils.swift; sourceTree = "<group>"; };
1929BA8AC40B901B20F20B71 /* FileUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileUtils.swift; sourceTree = "<group>"; }; 1929BA8AC40B901B20F20B71 /* FileUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileUtils.swift; sourceTree = "<group>"; };
1929BB251F74BEFC82CEEF84 /* PrefPane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefPane.swift; sourceTree = "<group>"; }; 1929BB251F74BEFC82CEEF84 /* PrefPane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefPane.swift; sourceTree = "<group>"; };
1929BB6CFF4CC0B5E8B00C62 /* Wrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Wrapper.m; sourceTree = "<group>"; }; 1929BB6CFF4CC0B5E8B00C62 /* DataWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataWrapper.m; sourceTree = "<group>"; };
1929BBC84557C8351EC6183E /* FileItemIgnorePatternTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileItemIgnorePatternTest.swift; sourceTree = "<group>"; }; 1929BBC84557C8351EC6183E /* FileItemIgnorePatternTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileItemIgnorePatternTest.swift; sourceTree = "<group>"; };
1929BC19C1BC19246AFF1621 /* MatcherTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatcherTests.swift; sourceTree = "<group>"; }; 1929BC19C1BC19246AFF1621 /* MatcherTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatcherTests.swift; sourceTree = "<group>"; };
1929BDF9EBAF1D9D44399045 /* ScoredFileItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScoredFileItem.swift; sourceTree = "<group>"; }; 1929BDF9EBAF1D9D44399045 /* ScoredFileItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScoredFileItem.swift; sourceTree = "<group>"; };
@ -646,8 +646,8 @@
1929B5C3F2F1CA4113DABFFD /* CocoaCategories.m */, 1929B5C3F2F1CA4113DABFFD /* CocoaCategories.m */,
1929BE69CF9AB1A10D0DD4F2 /* CocoaCategories.h */, 1929BE69CF9AB1A10D0DD4F2 /* CocoaCategories.h */,
1929BFC86BF38D341F2DDCBD /* NeoVim Objects */, 1929BFC86BF38D341F2DDCBD /* NeoVim Objects */,
1929BB6CFF4CC0B5E8B00C62 /* Wrapper.m */, 1929BB6CFF4CC0B5E8B00C62 /* DataWrapper.m */,
1929B0EEBE4A765934AF8335 /* Wrapper.h */, 1929B0EEBE4A765934AF8335 /* DataWrapper.h */,
); );
path = NeoVimServer; path = NeoVimServer;
sourceTree = "<group>"; sourceTree = "<group>";
@ -1168,7 +1168,7 @@
4BDD058D1DBBC50000D1B405 /* NeoVimWindow.m in Sources */, 4BDD058D1DBBC50000D1B405 /* NeoVimWindow.m in Sources */,
4BDD05871DBBC50000D1B405 /* NeoVimBuffer.m in Sources */, 4BDD05871DBBC50000D1B405 /* NeoVimBuffer.m in Sources */,
1929B1E05C116514C1D3A384 /* CocoaCategories.m in Sources */, 1929B1E05C116514C1D3A384 /* CocoaCategories.m in Sources */,
1929B18A0D7C7407C51DB642 /* Wrapper.m in Sources */, 1929B18A0D7C7407C51DB642 /* DataWrapper.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };