mirror of
https://github.com/ypresto/SwiftLintXcode.git
synced 2026-04-27 14:57:38 +00:00
Rename to SwiftLintXcode
This commit is contained in:
parent
a6e7b9b1e2
commit
219b4699cf
13 changed files with 95 additions and 105 deletions
10
README.md
10
README.md
|
|
@ -1,5 +1,5 @@
|
||||||
SwiftLintAutoCorrect
|
SwiftLintXcode
|
||||||
====================
|
==============
|
||||||
|
|
||||||
An Xcode plug-in to format your code using [SwiftLint](https://github.com/realm/SwiftLint).
|
An Xcode plug-in to format your code using [SwiftLint](https://github.com/realm/SwiftLint).
|
||||||
|
|
||||||
|
|
@ -16,8 +16,8 @@ INSTALLATION
|
||||||
# Please ensure swiftlint is on PATH.
|
# Please ensure swiftlint is on PATH.
|
||||||
brew update && brew install swiftlint
|
brew update && brew install swiftlint
|
||||||
|
|
||||||
git clone https://github.com/ypresto/SwiftLintAutoCorrect
|
git clone https://github.com/ypresto/SwiftLintXcode
|
||||||
cd SwiftLintAutoCorrect
|
cd SwiftLintXcode
|
||||||
# Build and install.
|
# Build and install.
|
||||||
xcodebuild -configuration Release
|
xcodebuild -configuration Release
|
||||||
```
|
```
|
||||||
|
|
@ -25,7 +25,7 @@ xcodebuild -configuration Release
|
||||||
To uninstall, just remove plug-in directory.
|
To uninstall, just remove plug-in directory.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
rm -rf "$HOME/Library/Application Support/Developer/Shared/Xcode/Plug-ins/SwiftLintAutoCorrect.xcplugin"
|
rm -rf "$HOME/Library/Application Support/Developer/Shared/Xcode/Plug-ins/SwiftLintXcode.xcplugin"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>SuppressBuildableAutocreation</key>
|
|
||||||
<dict>
|
|
||||||
<key>04E4BF2E1CB25D3100BC7305</key>
|
|
||||||
<dict>
|
|
||||||
<key>primary</key>
|
|
||||||
<true/>
|
|
||||||
</dict>
|
|
||||||
</dict>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
|
|
@ -7,22 +7,22 @@
|
||||||
objects = {
|
objects = {
|
||||||
|
|
||||||
/* Begin PBXBuildFile section */
|
/* Begin PBXBuildFile section */
|
||||||
0498717F1CB27F8900C5F7B5 /* SwiftLintAutoCorrectTRVSXcode.m in Sources */ = {isa = PBXBuildFile; fileRef = 0498717E1CB27F8900C5F7B5 /* SwiftLintAutoCorrectTRVSXcode.m */; };
|
0498717F1CB27F8900C5F7B5 /* SwiftLintXcodeTRVSXcode.m in Sources */ = {isa = PBXBuildFile; fileRef = 0498717E1CB27F8900C5F7B5 /* SwiftLintXcodeTRVSXcode.m */; };
|
||||||
049871811CB28EBF00C5F7B5 /* Formatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049871801CB28EBF00C5F7B5 /* Formatter.swift */; };
|
049871811CB28EBF00C5F7B5 /* Formatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049871801CB28EBF00C5F7B5 /* Formatter.swift */; };
|
||||||
04E4BF341CB25D3200BC7305 /* SwiftLintAutoCorrect.xcscheme in Resources */ = {isa = PBXBuildFile; fileRef = 04E4BF331CB25D3200BC7305 /* SwiftLintAutoCorrect.xcscheme */; };
|
04E4BF341CB25D3200BC7305 /* SwiftLintXcode.xcscheme in Resources */ = {isa = PBXBuildFile; fileRef = 04E4BF331CB25D3200BC7305 /* SwiftLintXcode.xcscheme */; };
|
||||||
04E4BF361CB25D3200BC7305 /* SwiftLintAutoCorrect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E4BF351CB25D3200BC7305 /* SwiftLintAutoCorrect.swift */; };
|
04E4BF361CB25D3200BC7305 /* SwiftLintXcode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E4BF351CB25D3200BC7305 /* SwiftLintXcode.swift */; };
|
||||||
04E4BF381CB25D3200BC7305 /* NSObject_Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E4BF371CB25D3200BC7305 /* NSObject_Extension.swift */; };
|
04E4BF381CB25D3200BC7305 /* NSObject_Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E4BF371CB25D3200BC7305 /* NSObject_Extension.swift */; };
|
||||||
04E4BF411CB273A700BC7305 /* SaveHook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E4BF401CB273A700BC7305 /* SaveHook.swift */; };
|
04E4BF411CB273A700BC7305 /* SaveHook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E4BF401CB273A700BC7305 /* SaveHook.swift */; };
|
||||||
/* End PBXBuildFile section */
|
/* End PBXBuildFile section */
|
||||||
|
|
||||||
/* Begin PBXFileReference section */
|
/* Begin PBXFileReference section */
|
||||||
0498717C1CB27F8800C5F7B5 /* SwiftLintAutoCorrect-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SwiftLintAutoCorrect-Bridging-Header.h"; sourceTree = "<group>"; };
|
0498717C1CB27F8800C5F7B5 /* SwiftLintXcode-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SwiftLintXcode-Bridging-Header.h"; sourceTree = "<group>"; };
|
||||||
0498717D1CB27F8900C5F7B5 /* SwiftLintAutoCorrectTRVSXcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SwiftLintAutoCorrectTRVSXcode.h; sourceTree = "<group>"; };
|
0498717D1CB27F8900C5F7B5 /* SwiftLintXcodeTRVSXcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SwiftLintXcodeTRVSXcode.h; sourceTree = "<group>"; };
|
||||||
0498717E1CB27F8900C5F7B5 /* SwiftLintAutoCorrectTRVSXcode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SwiftLintAutoCorrectTRVSXcode.m; sourceTree = "<group>"; };
|
0498717E1CB27F8900C5F7B5 /* SwiftLintXcodeTRVSXcode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SwiftLintXcodeTRVSXcode.m; sourceTree = "<group>"; };
|
||||||
049871801CB28EBF00C5F7B5 /* Formatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Formatter.swift; sourceTree = "<group>"; };
|
049871801CB28EBF00C5F7B5 /* Formatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Formatter.swift; sourceTree = "<group>"; };
|
||||||
04E4BF2F1CB25D3100BC7305 /* SwiftLintAutoCorrect.xcplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwiftLintAutoCorrect.xcplugin; sourceTree = BUILT_PRODUCTS_DIR; };
|
04E4BF2F1CB25D3100BC7305 /* SwiftLintXcode.xcplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwiftLintXcode.xcplugin; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
04E4BF331CB25D3200BC7305 /* SwiftLintAutoCorrect.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = SwiftLintAutoCorrect.xcscheme; path = SwiftLintAutoCorrect.xcodeproj/xcshareddata/xcschemes/SwiftLintAutoCorrect.xcscheme; sourceTree = SOURCE_ROOT; };
|
04E4BF331CB25D3200BC7305 /* SwiftLintXcode.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = SwiftLintXcode.xcscheme; path = SwiftLintXcode.xcodeproj/xcshareddata/xcschemes/SwiftLintXcode.xcscheme; sourceTree = SOURCE_ROOT; };
|
||||||
04E4BF351CB25D3200BC7305 /* SwiftLintAutoCorrect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftLintAutoCorrect.swift; sourceTree = "<group>"; };
|
04E4BF351CB25D3200BC7305 /* SwiftLintXcode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftLintXcode.swift; sourceTree = "<group>"; };
|
||||||
04E4BF371CB25D3200BC7305 /* NSObject_Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSObject_Extension.swift; sourceTree = "<group>"; };
|
04E4BF371CB25D3200BC7305 /* NSObject_Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSObject_Extension.swift; sourceTree = "<group>"; };
|
||||||
04E4BF391CB25D3200BC7305 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
04E4BF391CB25D3200BC7305 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||||
04E4BF401CB273A700BC7305 /* SaveHook.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SaveHook.swift; sourceTree = "<group>"; };
|
04E4BF401CB273A700BC7305 /* SaveHook.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SaveHook.swift; sourceTree = "<group>"; };
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
04E4BF271CB25D3100BC7305 = {
|
04E4BF271CB25D3100BC7305 = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
04E4BF311CB25D3200BC7305 /* SwiftLintAutoCorrect */,
|
04E4BF311CB25D3200BC7305 /* SwiftLintXcode */,
|
||||||
04E4BF301CB25D3100BC7305 /* Products */,
|
04E4BF301CB25D3100BC7305 /* Products */,
|
||||||
);
|
);
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
|
@ -40,31 +40,31 @@
|
||||||
04E4BF301CB25D3100BC7305 /* Products */ = {
|
04E4BF301CB25D3100BC7305 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
04E4BF2F1CB25D3100BC7305 /* SwiftLintAutoCorrect.xcplugin */,
|
04E4BF2F1CB25D3100BC7305 /* SwiftLintXcode.xcplugin */,
|
||||||
);
|
);
|
||||||
name = Products;
|
name = Products;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
04E4BF311CB25D3200BC7305 /* SwiftLintAutoCorrect */ = {
|
04E4BF311CB25D3200BC7305 /* SwiftLintXcode */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
0498717D1CB27F8900C5F7B5 /* SwiftLintAutoCorrectTRVSXcode.h */,
|
0498717D1CB27F8900C5F7B5 /* SwiftLintXcodeTRVSXcode.h */,
|
||||||
0498717E1CB27F8900C5F7B5 /* SwiftLintAutoCorrectTRVSXcode.m */,
|
0498717E1CB27F8900C5F7B5 /* SwiftLintXcodeTRVSXcode.m */,
|
||||||
04E4BF351CB25D3200BC7305 /* SwiftLintAutoCorrect.swift */,
|
04E4BF351CB25D3200BC7305 /* SwiftLintXcode.swift */,
|
||||||
04E4BF371CB25D3200BC7305 /* NSObject_Extension.swift */,
|
04E4BF371CB25D3200BC7305 /* NSObject_Extension.swift */,
|
||||||
04E4BF401CB273A700BC7305 /* SaveHook.swift */,
|
04E4BF401CB273A700BC7305 /* SaveHook.swift */,
|
||||||
049871801CB28EBF00C5F7B5 /* Formatter.swift */,
|
049871801CB28EBF00C5F7B5 /* Formatter.swift */,
|
||||||
04E4BF391CB25D3200BC7305 /* Info.plist */,
|
04E4BF391CB25D3200BC7305 /* Info.plist */,
|
||||||
04E4BF321CB25D3200BC7305 /* Supporting Files */,
|
04E4BF321CB25D3200BC7305 /* Supporting Files */,
|
||||||
0498717C1CB27F8800C5F7B5 /* SwiftLintAutoCorrect-Bridging-Header.h */,
|
0498717C1CB27F8800C5F7B5 /* SwiftLintXcode-Bridging-Header.h */,
|
||||||
);
|
);
|
||||||
path = SwiftLintAutoCorrect;
|
path = SwiftLintXcode;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
04E4BF321CB25D3200BC7305 /* Supporting Files */ = {
|
04E4BF321CB25D3200BC7305 /* Supporting Files */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
04E4BF331CB25D3200BC7305 /* SwiftLintAutoCorrect.xcscheme */,
|
04E4BF331CB25D3200BC7305 /* SwiftLintXcode.xcscheme */,
|
||||||
);
|
);
|
||||||
name = "Supporting Files";
|
name = "Supporting Files";
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
|
@ -72,9 +72,9 @@
|
||||||
/* End PBXGroup section */
|
/* End PBXGroup section */
|
||||||
|
|
||||||
/* Begin PBXNativeTarget section */
|
/* Begin PBXNativeTarget section */
|
||||||
04E4BF2E1CB25D3100BC7305 /* SwiftLintAutoCorrect */ = {
|
04E4BF2E1CB25D3100BC7305 /* SwiftLintXcode */ = {
|
||||||
isa = PBXNativeTarget;
|
isa = PBXNativeTarget;
|
||||||
buildConfigurationList = 04E4BF3C1CB25D3200BC7305 /* Build configuration list for PBXNativeTarget "SwiftLintAutoCorrect" */;
|
buildConfigurationList = 04E4BF3C1CB25D3200BC7305 /* Build configuration list for PBXNativeTarget "SwiftLintXcode" */;
|
||||||
buildPhases = (
|
buildPhases = (
|
||||||
04E4BF2C1CB25D3100BC7305 /* Sources */,
|
04E4BF2C1CB25D3100BC7305 /* Sources */,
|
||||||
04E4BF2D1CB25D3100BC7305 /* Resources */,
|
04E4BF2D1CB25D3100BC7305 /* Resources */,
|
||||||
|
|
@ -83,9 +83,9 @@
|
||||||
);
|
);
|
||||||
dependencies = (
|
dependencies = (
|
||||||
);
|
);
|
||||||
name = SwiftLintAutoCorrect;
|
name = SwiftLintXcode;
|
||||||
productName = SwiftLintAutoCorrect;
|
productName = SwiftLintXcode;
|
||||||
productReference = 04E4BF2F1CB25D3100BC7305 /* SwiftLintAutoCorrect.xcplugin */;
|
productReference = 04E4BF2F1CB25D3100BC7305 /* SwiftLintXcode.xcplugin */;
|
||||||
productType = "com.apple.product-type.bundle";
|
productType = "com.apple.product-type.bundle";
|
||||||
};
|
};
|
||||||
/* End PBXNativeTarget section */
|
/* End PBXNativeTarget section */
|
||||||
|
|
@ -103,7 +103,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
buildConfigurationList = 04E4BF2B1CB25D3100BC7305 /* Build configuration list for PBXProject "SwiftLintAutoCorrect" */;
|
buildConfigurationList = 04E4BF2B1CB25D3100BC7305 /* Build configuration list for PBXProject "SwiftLintXcode" */;
|
||||||
compatibilityVersion = "Xcode 3.2";
|
compatibilityVersion = "Xcode 3.2";
|
||||||
developmentRegion = English;
|
developmentRegion = English;
|
||||||
hasScannedForEncodings = 0;
|
hasScannedForEncodings = 0;
|
||||||
|
|
@ -115,7 +115,7 @@
|
||||||
projectDirPath = "";
|
projectDirPath = "";
|
||||||
projectRoot = "";
|
projectRoot = "";
|
||||||
targets = (
|
targets = (
|
||||||
04E4BF2E1CB25D3100BC7305 /* SwiftLintAutoCorrect */,
|
04E4BF2E1CB25D3100BC7305 /* SwiftLintXcode */,
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
/* End PBXProject section */
|
/* End PBXProject section */
|
||||||
|
|
@ -125,7 +125,7 @@
|
||||||
isa = PBXResourcesBuildPhase;
|
isa = PBXResourcesBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
04E4BF341CB25D3200BC7305 /* SwiftLintAutoCorrect.xcscheme in Resources */,
|
04E4BF341CB25D3200BC7305 /* SwiftLintXcode.xcscheme in Resources */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
|
|
@ -136,8 +136,8 @@
|
||||||
isa = PBXSourcesBuildPhase;
|
isa = PBXSourcesBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
0498717F1CB27F8900C5F7B5 /* SwiftLintAutoCorrectTRVSXcode.m in Sources */,
|
0498717F1CB27F8900C5F7B5 /* SwiftLintXcodeTRVSXcode.m in Sources */,
|
||||||
04E4BF361CB25D3200BC7305 /* SwiftLintAutoCorrect.swift in Sources */,
|
04E4BF361CB25D3200BC7305 /* SwiftLintXcode.swift in Sources */,
|
||||||
049871811CB28EBF00C5F7B5 /* Formatter.swift in Sources */,
|
049871811CB28EBF00C5F7B5 /* Formatter.swift in Sources */,
|
||||||
04E4BF411CB273A700BC7305 /* SaveHook.swift in Sources */,
|
04E4BF411CB273A700BC7305 /* SaveHook.swift in Sources */,
|
||||||
04E4BF381CB25D3200BC7305 /* NSObject_Extension.swift in Sources */,
|
04E4BF381CB25D3200BC7305 /* NSObject_Extension.swift in Sources */,
|
||||||
|
|
@ -230,13 +230,13 @@
|
||||||
DEPLOYMENT_LOCATION = YES;
|
DEPLOYMENT_LOCATION = YES;
|
||||||
DSTROOT = "$(HOME)";
|
DSTROOT = "$(HOME)";
|
||||||
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
|
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
|
||||||
INFOPLIST_FILE = SwiftLintAutoCorrect/Info.plist;
|
INFOPLIST_FILE = SwiftLintXcode/Info.plist;
|
||||||
INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
|
INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(DT_TOOLCHAIN_DIR)/usr/lib/swift/macosx";
|
LD_RUNPATH_SEARCH_PATHS = "$(DT_TOOLCHAIN_DIR)/usr/lib/swift/macosx";
|
||||||
MACOSX_DEPLOYMENT_TARGET = 10.11;
|
MACOSX_DEPLOYMENT_TARGET = 10.11;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = net.ypresto.SwiftLintAutoCorrect;
|
PRODUCT_BUNDLE_IDENTIFIER = net.ypresto.SwiftLintXcode;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = SwiftLintXcode;
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "SwiftLintAutoCorrect/SwiftLintAutoCorrect-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "SwiftLintXcode/SwiftLintXcode-Bridging-Header.h";
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||||
WRAPPER_EXTENSION = xcplugin;
|
WRAPPER_EXTENSION = xcplugin;
|
||||||
};
|
};
|
||||||
|
|
@ -250,13 +250,13 @@
|
||||||
DEPLOYMENT_LOCATION = YES;
|
DEPLOYMENT_LOCATION = YES;
|
||||||
DSTROOT = "$(HOME)";
|
DSTROOT = "$(HOME)";
|
||||||
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
|
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
|
||||||
INFOPLIST_FILE = SwiftLintAutoCorrect/Info.plist;
|
INFOPLIST_FILE = SwiftLintXcode/Info.plist;
|
||||||
INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
|
INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(DT_TOOLCHAIN_DIR)/usr/lib/swift/macosx";
|
LD_RUNPATH_SEARCH_PATHS = "$(DT_TOOLCHAIN_DIR)/usr/lib/swift/macosx";
|
||||||
MACOSX_DEPLOYMENT_TARGET = 10.11;
|
MACOSX_DEPLOYMENT_TARGET = 10.11;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = net.ypresto.SwiftLintAutoCorrect;
|
PRODUCT_BUNDLE_IDENTIFIER = net.ypresto.SwiftLintXcode;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = SwiftLintXcode;
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "SwiftLintAutoCorrect/SwiftLintAutoCorrect-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "SwiftLintXcode/SwiftLintXcode-Bridging-Header.h";
|
||||||
WRAPPER_EXTENSION = xcplugin;
|
WRAPPER_EXTENSION = xcplugin;
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
|
|
@ -264,7 +264,7 @@
|
||||||
/* End XCBuildConfiguration section */
|
/* End XCBuildConfiguration section */
|
||||||
|
|
||||||
/* Begin XCConfigurationList section */
|
/* Begin XCConfigurationList section */
|
||||||
04E4BF2B1CB25D3100BC7305 /* Build configuration list for PBXProject "SwiftLintAutoCorrect" */ = {
|
04E4BF2B1CB25D3100BC7305 /* Build configuration list for PBXProject "SwiftLintXcode" */ = {
|
||||||
isa = XCConfigurationList;
|
isa = XCConfigurationList;
|
||||||
buildConfigurations = (
|
buildConfigurations = (
|
||||||
04E4BF3A1CB25D3200BC7305 /* Debug */,
|
04E4BF3A1CB25D3200BC7305 /* Debug */,
|
||||||
|
|
@ -273,7 +273,7 @@
|
||||||
defaultConfigurationIsVisible = 0;
|
defaultConfigurationIsVisible = 0;
|
||||||
defaultConfigurationName = Release;
|
defaultConfigurationName = Release;
|
||||||
};
|
};
|
||||||
04E4BF3C1CB25D3200BC7305 /* Build configuration list for PBXNativeTarget "SwiftLintAutoCorrect" */ = {
|
04E4BF3C1CB25D3200BC7305 /* Build configuration list for PBXNativeTarget "SwiftLintXcode" */ = {
|
||||||
isa = XCConfigurationList;
|
isa = XCConfigurationList;
|
||||||
buildConfigurations = (
|
buildConfigurations = (
|
||||||
04E4BF3D1CB25D3200BC7305 /* Debug */,
|
04E4BF3D1CB25D3200BC7305 /* Debug */,
|
||||||
|
|
@ -2,6 +2,6 @@
|
||||||
<Workspace
|
<Workspace
|
||||||
version = "1.0">
|
version = "1.0">
|
||||||
<FileRef
|
<FileRef
|
||||||
location = "self:SwiftLintAutoCorrect.xcodeproj">
|
location = "self:/Users/yuya.tanaka/Dropbox/repo/SwiftLintXcode/SwiftLintXcode.xcodeproj">
|
||||||
</FileRef>
|
</FileRef>
|
||||||
</Workspace>
|
</Workspace>
|
||||||
|
|
@ -14,10 +14,10 @@
|
||||||
buildForAnalyzing = "YES">
|
buildForAnalyzing = "YES">
|
||||||
<BuildableReference
|
<BuildableReference
|
||||||
BuildableIdentifier = "primary"
|
BuildableIdentifier = "primary"
|
||||||
BlueprintIdentifier = "890A4B3E171F031300AFE577"
|
BlueprintIdentifier = "04E4BF2E1CB25D3100BC7305"
|
||||||
BuildableName = "SwiftLintAutoCorrect.xcplugin"
|
BuildableName = "SwiftLintXcode.xcplugin"
|
||||||
BlueprintName = "SwiftLintAutoCorrect"
|
BlueprintName = "SwiftLintXcode"
|
||||||
ReferencedContainer = "container:SwiftLintAutoCorrect.xcodeproj">
|
ReferencedContainer = "container:SwiftLintXcode.xcodeproj">
|
||||||
</BuildableReference>
|
</BuildableReference>
|
||||||
</BuildActionEntry>
|
</BuildActionEntry>
|
||||||
<BuildActionEntry
|
<BuildActionEntry
|
||||||
|
|
@ -29,52 +29,56 @@
|
||||||
<BuildableReference
|
<BuildableReference
|
||||||
BuildableIdentifier = "primary"
|
BuildableIdentifier = "primary"
|
||||||
BlueprintIdentifier = "8966AFCA173EB7BF004150C0"
|
BlueprintIdentifier = "8966AFCA173EB7BF004150C0"
|
||||||
BuildableName = "SwiftLintAutoCorrectTests.xctest"
|
BuildableName = "SwiftLintXcodeTests.xctest"
|
||||||
BlueprintName = "SwiftLintAutoCorrectTests"
|
BlueprintName = "SwiftLintXcodeTests"
|
||||||
ReferencedContainer = "container:SwiftLintAutoCorrect.xcodeproj">
|
ReferencedContainer = "container:SwiftLintXcode.xcodeproj">
|
||||||
</BuildableReference>
|
</BuildableReference>
|
||||||
</BuildActionEntry>
|
</BuildActionEntry>
|
||||||
</BuildActionEntries>
|
</BuildActionEntries>
|
||||||
</BuildAction>
|
</BuildAction>
|
||||||
<TestAction
|
<TestAction
|
||||||
|
buildConfiguration = "Debug"
|
||||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
shouldUseLaunchSchemeArgsEnv = "YES">
|
||||||
buildConfiguration = "Debug">
|
|
||||||
<Testables>
|
<Testables>
|
||||||
</Testables>
|
</Testables>
|
||||||
|
<AdditionalOptions>
|
||||||
|
</AdditionalOptions>
|
||||||
</TestAction>
|
</TestAction>
|
||||||
<LaunchAction
|
<LaunchAction
|
||||||
|
buildConfiguration = "Debug"
|
||||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||||
launchStyle = "0"
|
launchStyle = "0"
|
||||||
useCustomWorkingDirectory = "NO"
|
useCustomWorkingDirectory = "NO"
|
||||||
buildConfiguration = "Debug"
|
|
||||||
ignoresPersistentStateOnLaunch = "NO"
|
ignoresPersistentStateOnLaunch = "NO"
|
||||||
debugDocumentVersioning = "NO"
|
debugDocumentVersioning = "NO"
|
||||||
debugXPCServices = "NO"
|
debugXPCServices = "NO"
|
||||||
|
debugServiceExtension = "internal"
|
||||||
allowLocationSimulation = "NO"
|
allowLocationSimulation = "NO"
|
||||||
viewDebuggingEnabled = "No">
|
viewDebuggingEnabled = "No">
|
||||||
<PathRunnable
|
<PathRunnable
|
||||||
|
runnableDebuggingMode = "0"
|
||||||
FilePath = "/Applications/Xcode.app">
|
FilePath = "/Applications/Xcode.app">
|
||||||
</PathRunnable>
|
</PathRunnable>
|
||||||
<MacroExpansion>
|
<MacroExpansion>
|
||||||
<BuildableReference
|
<BuildableReference
|
||||||
BuildableIdentifier = "primary"
|
BuildableIdentifier = "primary"
|
||||||
BlueprintIdentifier = "890A4B3E171F031300AFE577"
|
BlueprintIdentifier = "04E4BF2E1CB25D3100BC7305"
|
||||||
BuildableName = "SwiftLintAutoCorrect.xcplugin"
|
BuildableName = "SwiftLintXcode.xcplugin"
|
||||||
BlueprintName = "SwiftLintAutoCorrect"
|
BlueprintName = "SwiftLintXcode"
|
||||||
ReferencedContainer = "container:SwiftLintAutoCorrect.xcodeproj">
|
ReferencedContainer = "container:SwiftLintXcode.xcodeproj">
|
||||||
</BuildableReference>
|
</BuildableReference>
|
||||||
</MacroExpansion>
|
</MacroExpansion>
|
||||||
<AdditionalOptions>
|
<AdditionalOptions>
|
||||||
</AdditionalOptions>
|
</AdditionalOptions>
|
||||||
</LaunchAction>
|
</LaunchAction>
|
||||||
<ProfileAction
|
<ProfileAction
|
||||||
|
buildConfiguration = "Release"
|
||||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||||
savedToolIdentifier = ""
|
savedToolIdentifier = ""
|
||||||
useCustomWorkingDirectory = "NO"
|
useCustomWorkingDirectory = "NO"
|
||||||
buildConfiguration = "Release"
|
|
||||||
debugDocumentVersioning = "YES">
|
debugDocumentVersioning = "YES">
|
||||||
</ProfileAction>
|
</ProfileAction>
|
||||||
<AnalyzeAction
|
<AnalyzeAction
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
//
|
//
|
||||||
// Formatter.swift
|
// Formatter.swift
|
||||||
// SwiftLintAutoCorrect
|
// SwiftLintXcode
|
||||||
//
|
//
|
||||||
// Created by yuya.tanaka on 2016/04/04.
|
// Created by yuya.tanaka on 2016/04/04.
|
||||||
// Copyright (c) 2016 Yuya Tanaka. All rights reserved.
|
// Copyright (c) 2016 Yuya Tanaka. All rights reserved.
|
||||||
|
|
@ -11,10 +11,10 @@ import Cocoa
|
||||||
|
|
||||||
final class Formatter {
|
final class Formatter {
|
||||||
static var sharedInstance = Formatter()
|
static var sharedInstance = Formatter()
|
||||||
private static let pathExtension = "swiftlintautocorrect"
|
private static let pathExtension = "SwiftLintXcode"
|
||||||
|
|
||||||
let fileManager = NSFileManager.defaultManager()
|
let fileManager = NSFileManager.defaultManager()
|
||||||
let tempDirURL: NSURL = NSURL(fileURLWithPath: NSTemporaryDirectory()).URLByAppendingPathComponent("SwiftLintAutoCorrect-\(NSUUID().UUIDString)")
|
let tempDirURL: NSURL = NSURL(fileURLWithPath: NSTemporaryDirectory()).URLByAppendingPathComponent("SwiftLintXcode-\(NSUUID().UUIDString)")
|
||||||
|
|
||||||
struct CursorPosition {
|
struct CursorPosition {
|
||||||
let line: Int
|
let line: Int
|
||||||
|
|
@ -33,7 +33,7 @@ final class Formatter {
|
||||||
} catch let error as NSError {
|
} catch let error as NSError {
|
||||||
NSAlert(error: error).runModal()
|
NSAlert(error: error).runModal()
|
||||||
} catch {
|
} catch {
|
||||||
NSAlert(error: NSError(domain: "net.ypresto.swiftlintautocorrect", code: 0, userInfo: [
|
NSAlert(error: NSError(domain: "net.ypresto.SwiftLintXcode", code: 0, userInfo: [
|
||||||
NSLocalizedDescriptionKey: "Unknown error occured: \(error)"
|
NSLocalizedDescriptionKey: "Unknown error occured: \(error)"
|
||||||
])).runModal()
|
])).runModal()
|
||||||
}
|
}
|
||||||
|
|
@ -46,7 +46,7 @@ final class Formatter {
|
||||||
let formattedString = try formatString(originalString)
|
let formattedString = try formatString(originalString)
|
||||||
if formattedString == originalString { return }
|
if formattedString == originalString { return }
|
||||||
|
|
||||||
let selectedRange = SwiftLintAutoCorrectTRVSXcode.textView().selectedRange()
|
let selectedRange = SwiftLintXcodeTRVSXcode.textView().selectedRange()
|
||||||
let cursorPosition = cursorPositionForSelectedRange(selectedRange, textStorage: textStorage)
|
let cursorPosition = cursorPositionForSelectedRange(selectedRange, textStorage: textStorage)
|
||||||
|
|
||||||
textStorage.beginEditing()
|
textStorage.beginEditing()
|
||||||
|
|
@ -54,7 +54,7 @@ final class Formatter {
|
||||||
textStorage.endEditing()
|
textStorage.endEditing()
|
||||||
|
|
||||||
let newLocation = locationForCursorPosition(cursorPosition, textStorage: textStorage)
|
let newLocation = locationForCursorPosition(cursorPosition, textStorage: textStorage)
|
||||||
SwiftLintAutoCorrectTRVSXcode.textView().setSelectedRange(NSRange(location: newLocation, length: 0))
|
SwiftLintXcodeTRVSXcode.textView().setSelectedRange(NSRange(location: newLocation, length: 0))
|
||||||
}
|
}
|
||||||
|
|
||||||
private func cursorPositionForSelectedRange(selectedRange: NSRange, textStorage: DVTSourceTextStorage) -> CursorPosition {
|
private func cursorPositionForSelectedRange(selectedRange: NSRange, textStorage: DVTSourceTextStorage) -> CursorPosition {
|
||||||
|
|
@ -83,7 +83,7 @@ final class Formatter {
|
||||||
])
|
])
|
||||||
task.waitUntilExit()
|
task.waitUntilExit()
|
||||||
if task.terminationStatus != 0 {
|
if task.terminationStatus != 0 {
|
||||||
throw NSError(domain: "net.ypresto.swiftlintautocorrect", code: 0, userInfo: [
|
throw NSError(domain: "net.ypresto.SwiftLintXcode", code: 0, userInfo: [
|
||||||
NSLocalizedDescriptionKey: "Executing swiftlint exited with non-zero status."
|
NSLocalizedDescriptionKey: "Executing swiftlint exited with non-zero status."
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
@ -102,20 +102,20 @@ final class Formatter {
|
||||||
task.launch()
|
task.launch()
|
||||||
task.waitUntilExit()
|
task.waitUntilExit()
|
||||||
if task.terminationStatus != 0 {
|
if task.terminationStatus != 0 {
|
||||||
throw NSError(domain: "net.ypresto.swiftlintautocorrect", code: 0, userInfo: [
|
throw NSError(domain: "net.ypresto.SwiftLintXcode", code: 0, userInfo: [
|
||||||
NSLocalizedDescriptionKey: "Executing `which swiftlint` exited with non-zero status."
|
NSLocalizedDescriptionKey: "Executing `which swiftlint` exited with non-zero status."
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
let data = pipe.fileHandleForReading.readDataToEndOfFile()
|
let data = pipe.fileHandleForReading.readDataToEndOfFile()
|
||||||
guard let pathString = String(data: data, encoding: NSUTF8StringEncoding) else {
|
guard let pathString = String(data: data, encoding: NSUTF8StringEncoding) else {
|
||||||
throw NSError(domain: "net.ypresto.swiftlintautocorrect", code: 0, userInfo: [
|
throw NSError(domain: "net.ypresto.SwiftLintXcode", code: 0, userInfo: [
|
||||||
NSLocalizedDescriptionKey: "Cannot read result of `which swiftlint`."
|
NSLocalizedDescriptionKey: "Cannot read result of `which swiftlint`."
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
let path = pathString.stringByTrimmingCharactersInSet(NSCharacterSet.newlineCharacterSet())
|
let path = pathString.stringByTrimmingCharactersInSet(NSCharacterSet.newlineCharacterSet())
|
||||||
if !fileManager.isExecutableFileAtPath(path) {
|
if !fileManager.isExecutableFileAtPath(path) {
|
||||||
throw NSError(domain: "net.ypresto.swiftlintautocorrect", code: 0, userInfo: [
|
throw NSError(domain: "net.ypresto.SwiftLintXcode", code: 0, userInfo: [
|
||||||
NSLocalizedDescriptionKey: "swiftlint at \(path) is not executable."
|
NSLocalizedDescriptionKey: "swiftlint at \(path) is not executable."
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
@ -126,7 +126,7 @@ final class Formatter {
|
||||||
try ensureTemporaryDirectory()
|
try ensureTemporaryDirectory()
|
||||||
let filePath = createTemporaryPath()
|
let filePath = createTemporaryPath()
|
||||||
if fileManager.fileExistsAtPath(filePath) {
|
if fileManager.fileExistsAtPath(filePath) {
|
||||||
throw NSError(domain: "net.ypresto.swiftlintautocorrect", code: 0, userInfo: [
|
throw NSError(domain: "net.ypresto.SwiftLintXcode", code: 0, userInfo: [
|
||||||
NSLocalizedDescriptionKey: "Cannot write to \(filePath), file already exists."
|
NSLocalizedDescriptionKey: "Cannot write to \(filePath), file already exists."
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||||
<key>NSPrincipalClass</key>
|
<key>NSPrincipalClass</key>
|
||||||
<string>SwiftLintAutoCorrect</string>
|
<string>SwiftLintXcode</string>
|
||||||
<key>XC4Compatible</key>
|
<key>XC4Compatible</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>XCPluginHasUI</key>
|
<key>XCPluginHasUI</key>
|
||||||
|
|
@ -12,7 +12,7 @@ extension NSObject {
|
||||||
let appName = NSBundle.mainBundle().infoDictionary?["CFBundleName"] as? NSString
|
let appName = NSBundle.mainBundle().infoDictionary?["CFBundleName"] as? NSString
|
||||||
if appName == "Xcode" {
|
if appName == "Xcode" {
|
||||||
if sharedPlugin == nil {
|
if sharedPlugin == nil {
|
||||||
sharedPlugin = SwiftLintAutoCorrect(bundle: bundle)
|
sharedPlugin = SwiftLintXcode(bundle: bundle)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
//
|
//
|
||||||
// SaveHook.swift
|
// SaveHook.swift
|
||||||
// SwiftLintAutoCorrect
|
// SwiftLintXcode
|
||||||
//
|
//
|
||||||
// Created by yuya.tanaka on 2016/04/04.
|
// Created by yuya.tanaka on 2016/04/04.
|
||||||
// Copyright (c) 2016 Yuya Tanaka. All rights reserved.
|
// Copyright (c) 2016 Yuya Tanaka. All rights reserved.
|
||||||
|
|
@ -25,14 +25,14 @@ final class SaveHook {
|
||||||
swizzled = true
|
swizzled = true
|
||||||
|
|
||||||
let fromMethod = class_getInstanceMethod(NSDocument.self, #selector(NSDocument.saveDocumentWithDelegate(_:didSaveSelector:contextInfo:)))
|
let fromMethod = class_getInstanceMethod(NSDocument.self, #selector(NSDocument.saveDocumentWithDelegate(_:didSaveSelector:contextInfo:)))
|
||||||
let toMethod = class_getInstanceMethod(NSDocument.self, #selector(NSDocument.swiftLintAutoCorrectSaveDocumentWithDelegate(_:didSaveSelector:contextInfo:)))
|
let toMethod = class_getInstanceMethod(NSDocument.self, #selector(NSDocument.SwiftLintXcodeSaveDocumentWithDelegate(_:didSaveSelector:contextInfo:)))
|
||||||
method_exchangeImplementations(fromMethod, toMethod)
|
method_exchangeImplementations(fromMethod, toMethod)
|
||||||
}
|
}
|
||||||
|
|
||||||
class func tryOnSaveDocument(document: NSDocument) -> Bool {
|
class func tryOnSaveDocument(document: NSDocument) -> Bool {
|
||||||
if !enabled { return true }
|
if !enabled { return true }
|
||||||
Formatter.isFormattableDocument(document)
|
Formatter.isFormattableDocument(document)
|
||||||
let sourceCodeDocument: IDESourceCodeDocument = SwiftLintAutoCorrectTRVSXcode.sourceCodeDocument()
|
let sourceCodeDocument: IDESourceCodeDocument = SwiftLintXcodeTRVSXcode.sourceCodeDocument()
|
||||||
guard sourceCodeDocument == document else { return true }
|
guard sourceCodeDocument == document else { return true }
|
||||||
return Formatter.sharedInstance.tryFormatDocument(sourceCodeDocument)
|
return Formatter.sharedInstance.tryFormatDocument(sourceCodeDocument)
|
||||||
}
|
}
|
||||||
|
|
@ -41,10 +41,10 @@ final class SaveHook {
|
||||||
// https://github.com/travisjeffery/ClangFormat-Xcode/blob/a22114907592fb5d5b1043a4919d7be3e1496741/ClangFormat/NSDocument+TRVSClangFormat.m
|
// https://github.com/travisjeffery/ClangFormat-Xcode/blob/a22114907592fb5d5b1043a4919d7be3e1496741/ClangFormat/NSDocument+TRVSClangFormat.m
|
||||||
extension NSDocument {
|
extension NSDocument {
|
||||||
|
|
||||||
dynamic func swiftLintAutoCorrectSaveDocumentWithDelegate(delegate: AnyObject?, didSaveSelector: Selector, contextInfo: UnsafeMutablePointer<Void>) -> Void {
|
dynamic func SwiftLintXcodeSaveDocumentWithDelegate(delegate: AnyObject?, didSaveSelector: Selector, contextInfo: UnsafeMutablePointer<Void>) -> Void {
|
||||||
if SaveHook.tryOnSaveDocument(self) {
|
if SaveHook.tryOnSaveDocument(self) {
|
||||||
// NOTE: Call original method
|
// NOTE: Call original method
|
||||||
swiftLintAutoCorrectSaveDocumentWithDelegate(delegate, didSaveSelector: didSaveSelector, contextInfo: contextInfo);
|
SwiftLintXcodeSaveDocumentWithDelegate(delegate, didSaveSelector: didSaveSelector, contextInfo: contextInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2,4 +2,4 @@
|
||||||
// Use this file to import your target's public headers that you would like to expose to Swift.
|
// Use this file to import your target's public headers that you would like to expose to Swift.
|
||||||
//
|
//
|
||||||
|
|
||||||
#import "SwiftLintAutoCorrectTRVSXcode.h"
|
#import "SwiftLintXcodeTRVSXcode.h"
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
//
|
//
|
||||||
// SwiftLintAutoCorrect.swift
|
// SwiftLintXcode.swift
|
||||||
//
|
//
|
||||||
// Created by yuya.tanaka on 2016/04/04.
|
// Created by yuya.tanaka on 2016/04/04.
|
||||||
// Copyright (c) 2016 Yuya Tanaka. All rights reserved.
|
// Copyright (c) 2016 Yuya Tanaka. All rights reserved.
|
||||||
|
|
@ -7,9 +7,9 @@
|
||||||
|
|
||||||
import AppKit
|
import AppKit
|
||||||
|
|
||||||
var sharedPlugin: SwiftLintAutoCorrect?
|
var sharedPlugin: SwiftLintXcode?
|
||||||
|
|
||||||
class SwiftLintAutoCorrect: NSObject {
|
class SwiftLintXcode: NSObject {
|
||||||
|
|
||||||
var bundle: NSBundle
|
var bundle: NSBundle
|
||||||
lazy var center = NSNotificationCenter.defaultCenter()
|
lazy var center = NSNotificationCenter.defaultCenter()
|
||||||
|
|
@ -21,7 +21,7 @@ class SwiftLintAutoCorrect: NSObject {
|
||||||
self.bundle = bundle
|
self.bundle = bundle
|
||||||
|
|
||||||
super.init()
|
super.init()
|
||||||
center.addObserver(self, selector: #selector(SwiftLintAutoCorrect.onApplicationDidFinishLaunching), name: NSApplicationDidFinishLaunchingNotification, object: nil)
|
center.addObserver(self, selector: #selector(SwiftLintXcode.onApplicationDidFinishLaunching), name: NSApplicationDidFinishLaunchingNotification, object: nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
deinit {
|
deinit {
|
||||||
|
|
@ -42,20 +42,20 @@ class SwiftLintAutoCorrect: NSObject {
|
||||||
|
|
||||||
guard let item = NSApp.mainMenu!.itemWithTitle("Edit") else { return }
|
guard let item = NSApp.mainMenu!.itemWithTitle("Edit") else { return }
|
||||||
|
|
||||||
let pluginMenu = NSMenu(title:"SwiftLint AutoCorrect")
|
let pluginMenu = NSMenu(title:"SwiftLintXcode")
|
||||||
let pluginMenuItem = NSMenuItem(title:"SwiftLint AutoCorrect", action: nil, keyEquivalent: "")
|
let pluginMenuItem = NSMenuItem(title:"SwiftLintXcode", action: nil, keyEquivalent: "")
|
||||||
pluginMenuItem.submenu = pluginMenu
|
pluginMenuItem.submenu = pluginMenu
|
||||||
|
|
||||||
let autoCorrectMenuItem = NSMenuItem(title:"AutoCorrect Current File", action:#selector(SwiftLintAutoCorrect.doAutoCorrect), keyEquivalent:"")
|
let autoCorrectMenuItem = NSMenuItem(title:"AutoCorrect Current File", action:#selector(SwiftLintXcode.doAutoCorrect), keyEquivalent:"")
|
||||||
autoCorrectMenuItem.target = self
|
autoCorrectMenuItem.target = self
|
||||||
pluginMenu.addItem(autoCorrectMenuItem)
|
pluginMenu.addItem(autoCorrectMenuItem)
|
||||||
|
|
||||||
let enableMenuItem = NSMenuItem(title:"Enable AutoCorrect on Save", action:#selector(SwiftLintAutoCorrect.doEnableFormatOnSave), keyEquivalent:"")
|
let enableMenuItem = NSMenuItem(title:"Enable AutoCorrect on Save", action:#selector(SwiftLintXcode.doEnableFormatOnSave), keyEquivalent:"")
|
||||||
enableMenuItem.target = self
|
enableMenuItem.target = self
|
||||||
pluginMenu.addItem(enableMenuItem)
|
pluginMenu.addItem(enableMenuItem)
|
||||||
self.enableMenuItem = enableMenuItem
|
self.enableMenuItem = enableMenuItem
|
||||||
|
|
||||||
let disableMenuItem = NSMenuItem(title:"Disable AutoCorrect on Save", action:#selector(SwiftLintAutoCorrect.doDisableFormatOnSave), keyEquivalent:"")
|
let disableMenuItem = NSMenuItem(title:"Disable AutoCorrect on Save", action:#selector(SwiftLintXcode.doDisableFormatOnSave), keyEquivalent:"")
|
||||||
disableMenuItem.target = self
|
disableMenuItem.target = self
|
||||||
pluginMenu.addItem(disableMenuItem)
|
pluginMenu.addItem(disableMenuItem)
|
||||||
self.disableMenuItem = disableMenuItem
|
self.disableMenuItem = disableMenuItem
|
||||||
|
|
@ -67,7 +67,7 @@ class SwiftLintAutoCorrect: NSObject {
|
||||||
}
|
}
|
||||||
|
|
||||||
func doAutoCorrect() {
|
func doAutoCorrect() {
|
||||||
let sourceCodeDocument: IDESourceCodeDocument = SwiftLintAutoCorrectTRVSXcode.sourceCodeDocument()
|
let sourceCodeDocument: IDESourceCodeDocument = SwiftLintXcodeTRVSXcode.sourceCodeDocument()
|
||||||
guard Formatter.isFormattableDocument(sourceCodeDocument) else { return }
|
guard Formatter.isFormattableDocument(sourceCodeDocument) else { return }
|
||||||
Formatter.sharedInstance.tryFormatDocument(sourceCodeDocument)
|
Formatter.sharedInstance.tryFormatDocument(sourceCodeDocument)
|
||||||
}
|
}
|
||||||
|
|
@ -123,7 +123,7 @@
|
||||||
@property (readonly) IDEWorkspace *workspace;
|
@property (readonly) IDEWorkspace *workspace;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface SwiftLintAutoCorrectTRVSXcode : NSObject
|
@interface SwiftLintXcodeTRVSXcode : NSObject
|
||||||
|
|
||||||
+ (IDESourceCodeDocument *)sourceCodeDocument;
|
+ (IDESourceCodeDocument *)sourceCodeDocument;
|
||||||
+ (NSTextView *)textView;
|
+ (NSTextView *)textView;
|
||||||
|
|
@ -6,9 +6,9 @@
|
||||||
// Copyright (c) 2014 Travis Jeffery. All rights reserved.
|
// Copyright (c) 2014 Travis Jeffery. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
#import "SwiftLintAutoCorrectTRVSXcode.h"
|
#import "SwiftLintXcodeTRVSXcode.h"
|
||||||
|
|
||||||
@implementation SwiftLintAutoCorrectTRVSXcode
|
@implementation SwiftLintXcodeTRVSXcode
|
||||||
|
|
||||||
+ (id)currentEditor {
|
+ (id)currentEditor {
|
||||||
if ([[self windowController]
|
if ([[self windowController]
|
||||||
Loading…
Reference in a new issue