Merge pull request velyan#5 from velyan/develop

Develop
exv-datnm · Oct 30, 2016 · 9dbff20 · 9dbff20
2 parents 619fd07 + 7d880e2
commit 9dbff20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Mark.xcodeproj/project.pbxproj b/Mark.xcodeproj/project.pbxproj
@@ -455,7 +455,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -498,7 +498,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -515,6 +515,7 @@
 				DEVELOPMENT_TEAM = L4ALPHW89P;
 				INFOPLIST_FILE = Mark/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_BUNDLE_IDENTIFIER = velyan.com.Mark;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
@@ -531,6 +532,7 @@
 				DEVELOPMENT_TEAM = L4ALPHW89P;
 				INFOPLIST_FILE = Mark/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_BUNDLE_IDENTIFIER = velyan.com.Mark;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;

diff --git a/MarkExtension/MarkParser.swift b/MarkExtension/MarkParser.swift
@@ -17,15 +17,16 @@ fileprivate struct MarkRegExPattern {
     static let commaString = ","
 }
 
-extension NSRegularExpression {
+fileprivate extension NSRegularExpression {
 
     func matches(in input: String) -> [NSTextCheckingResult]? {
         let range = NSRange(0 ..< input.characters.count)
         return self.matches(in: input, options: .reportProgress, range: range)
     }
 }
 
-extension String {
+fileprivate extension String {
+
     func alphabeticalString() -> String {
         let chars =  CharacterSet(charactersIn: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLKMNOPQRSTUVWXYZ0123456789").inverted
         let string = self.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -115,8 +116,9 @@ class MarkParser {
                 let rangeEnd = (line == endLine) ? range.end.column + 1 : lineString.length
                 selectionString.append(lineString.substring(with: NSMakeRange(rangeStart, rangeEnd - rangeStart)))
             }
-
-            let result = parse(string: selectionString, indentation: "")
+            let isEmptySelection = startLine == endLine && range.start.column == range.end.column
+            let indentation = (isEmptySelection) ? "" : "    "
+            let result = parse(string: selectionString, indentation: indentation)
             marks.append(MarkTuple(range.end.line, result))
         }