Merge pull request #1 from IvanMathy/main

Merge from main
IvanMathy · Nov 21, 2020 · 5a600ba · 5a600ba
2 parents 35d34f3 + 5144567
commit 5a600ba
Show file tree

Hide file tree

Showing 28 changed files with 4,208 additions and 81 deletions.
diff --git a/Boop/Boop.xcodeproj/project.pbxproj b/Boop/Boop.xcodeproj/project.pbxproj
@@ -745,7 +745,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = RLZ8XBTX7G;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -758,7 +758,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.3.0;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				PRODUCT_BUNDLE_IDENTIFIER = com.OKatBest.Boop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -775,7 +775,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -789,7 +789,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.3.0;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				PRODUCT_BUNDLE_IDENTIFIER = com.okatbest.boop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -806,7 +806,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -819,7 +819,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.3.0;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				"OTHER_SWIFT_FLAGS[arch=*]" = "-D APPSTORE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.OKatBest.Boop;
@@ -837,7 +837,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -850,7 +850,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.3.0;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				"OTHER_SWIFT_FLAGS[arch=*]" = "-D APPSTORE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.okatbest.boop;

diff --git a/Boop/Boop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Boop/Boop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/IvanMathy/savannakit",
         "state": {
           "branch": null,
-          "revision": "d0950476608b714f435c7026ab8c7f13b87e5e81",
-          "version": "0.14.2"
+          "revision": "bb51ee074152a7361e7085d10723f699c79fe673",
+          "version": "0.15.1"
         }
       }
     ]

diff --git a/Boop/Boop/Assets.xcassets/Icons/Contents.json b/Boop/Boop/Assets.xcassets/Icons/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/Boop/Boop/Assets.xcassets/Icons/icons8-elephant.imageset/Contents.json b/Boop/Boop/Assets.xcassets/Icons/icons8-elephant.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "icons8-elephant.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Boop/Boop/Assets.xcassets/Icons/icons8-elephant.imageset/icons8-elephant.pdf b/Boop/Boop/Assets.xcassets/Icons/icons8-elephant.imageset/icons8-elephant.pdf
diff --git a/Boop/Boop/Assets.xcassets/Icons/icons8-pineapple.imageset/Contents.json b/Boop/Boop/Assets.xcassets/Icons/icons8-pineapple.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "icons8-pineapple.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Boop/Boop/Assets.xcassets/Icons/icons8-pineapple.imageset/icons8-pineapple.pdf b/Boop/Boop/Assets.xcassets/Icons/icons8-pineapple.imageset/icons8-pineapple.pdf
diff --git a/Boop/Boop/Assets.xcassets/Icons/icons8-translation.imageset/Contents.json b/Boop/Boop/Assets.xcassets/Icons/icons8-translation.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "icons8-translation.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Boop/Boop/Assets.xcassets/Icons/icons8-translation.imageset/icons8-translation.pdf b/Boop/Boop/Assets.xcassets/Icons/icons8-translation.imageset/icons8-translation.pdf
diff --git a/Boop/Boop/Controllers/PopoverViewController.swift b/Boop/Boop/Controllers/PopoverViewController.swift
@@ -49,6 +49,7 @@ class PopoverViewController: NSViewController {
             var didSomething = false
 
             // Key codes:
+            let kVKTab = 0x30
             // 125 is down arrow
             // 126 is up
             // 53 is escape
@@ -72,9 +73,20 @@ class PopoverViewController: NSViewController {
 
                 didSomething = true
             }
-            
+
             let window = self.view.window
 
+            if theEvent.keyCode == kVKTab && self.enabled {
+                if window?.firstResponder is NSTextView &&
+                    (window?.firstResponder as! NSTextView).delegate is SearchField {
+                    let offset = theEvent.modifierFlags.contains(.shift) ? -1 : 1
+                    let newSel = IndexSet([self.tableView.selectedRow + offset])
+                    self.tableView.selectRowIndexes(newSel, byExtendingSelection: false)
+                    self.tableView.scrollRowToVisible(self.tableView.selectedRow)
+                }
+                didSomething = true // prevent tabbing back into text document
+            }
+
             if window?.firstResponder is NSTextView &&
                 (window?.firstResponder as! NSTextView).delegate is SearchField &&
                 theEvent.keyCode == 125 { // DOWN

diff --git a/Boop/Boop/Editor/BoopLexer.swift b/Boop/Boop/Editor/BoopLexer.swift
@@ -21,13 +21,7 @@ class BoopLexer: RegexLexer {
 
     func generators(source: String) -> [TokenGenerator] {
 
-        let standalonePrefix = "(?<=[\\s]|^|[\\(,:])"
-        let standaloneSuffix = "(?=[\\s\\?\\!,:\\)\\();]|$)"
-
-        let quoteLookahead = "(?=(?:(?:[^\"]*\"){2})*[^\"]*$)"
-
-        let quotes = "(\"|@\")(?:[^\"\\\\\\n]|\\\\.)*[^\"\\n]*(@\"|\")"
-        let number = "\\b(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)\\b"
+        let number = #"\b(?:0x[a-f0-9]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+\-]?\d+)?)\b"#
 
 
         var generators = [TokenGenerator?]()
@@ -36,61 +30,59 @@ class BoopLexer: RegexLexer {
 
         // Find common attributes
 
-        generators.append(regexToken(.attribute, "\(standalonePrefix)(\(commonAttributes.joined(separator: "|")))\(standaloneSuffix)", options: .caseInsensitive))
+        generators.append(regexToken(.attribute, #"\b(\#(commonAttributes.joined(separator: "|")))\b"#, options: .caseInsensitive))
 
-        generators.append(regexToken(.keyword, "\(standalonePrefix)(\(moreAttributes.joined(separator: "|")))\(standaloneSuffix)", options: .caseInsensitive))
+        generators.append(regexToken(.keyword, #"\b(\#(moreAttributes.joined(separator: "|")))\b"#, options: .caseInsensitive))
 
 
         // Extras
 
         let UTCDate = "(?:(Sun|Mon|Tue|Wed|Thu|Fri|Sat),\\s+)?(0[1-9]|[1-2]?[0-9]|3[01])\\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\s+(19[0-9]{2}|[2-9][0-9]{3})\\s+(2[0-3]|[0-1][0-9]):([0-5][0-9])(?::(60|[0-5][0-9]))?\\s+([-\\+][0-9]{2}[0-5][0-9]|(?:UT|GMT|(?:E|C|M|P)(?:ST|DT)|[A-IK-Z]))"
 
-        generators.append(regexToken(.number, "\(standalonePrefix)(\(UTCDate))\(standaloneSuffix)"))
+        generators.append(regexToken(.number, UTCDate))
 
         // - Match MD5 strings
-        generators.append(regexToken(.keyword, "\(standalonePrefix)([a-f0-9]{32})\(standaloneSuffix)"))
+        generators.append(regexToken(.keyword, "[a-f0-9]{32}"))
 
         // - Bootleg XML-like tags match:
 
-        generators.append(regexToken(.attribute, "(?m)\(quoteLookahead)<(?:.*?)\\b[^>]*\\/?>"))
+        generators.append(regexToken(.attribute, "<(?:.*?)\\b[^>]*\\/?>"))
 
-        // Strings
 
-        generators.append(regexToken(.string, quotes, options: [.dotMatchesLineSeparators, .caseInsensitive]))
+        // - Match JSON labels and generic parameters
+        generators.append(regexToken(.extra, #""([^"]+?)"\s*(?=:)"#, greedy: true))
 
-        generators.append(regexToken(.string, "`(?:[^`\\\\\\n]|\\\\.)*[^`\\n]*`", options: [.dotMatchesLineSeparators, .caseInsensitive]))
+        // Strings
 
-        generators.append(regexToken(.string, "'(?:[^\'\\\\\\n]|\\\\.)*[^\'\\n]*'", options: [.dotMatchesLineSeparators, .caseInsensitive]))
+        let quotes = #"(["'`])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1"#
 
-        generators.append(regexToken(.string, "(\"\"\")(.*?)(\"\"\")", options: [.dotMatchesLineSeparators, .caseInsensitive]))
+        generators.append(regexToken(.string, quotes, greedy: true))
 
-        // More Extras
+        generators.append(regexToken(.string, "(\"\"\")(.*?)(\"\"\")", options: [.dotMatchesLineSeparators, .caseInsensitive], greedy: true))
 
-        // - Match JSON labels and generic parameters
-        generators.append(regexToken(.extra, "(?m)\(quoteLookahead)(?=(?:[ {\\[]*))([^\\r\\n:\\s\\w]+?|\(quotes))\\s*(?=\\:(?!\\:))"))
 
 
 
         // Comments
 
-        generators.append(regexToken(.comment, "\(quoteLookahead)//(.*)"))
+        generators.append(regexToken(.comment, #"(?=(\/\/.*))"#))
 
-        generators.append(regexToken(.comment, "\(quoteLookahead)/\\*.*?\\*/", options: [.dotMatchesLineSeparators, .caseInsensitive]))
+        generators.append(regexToken(.comment, #"(?=(\/\*[\s\S]*?(?:\*\/|$)))"#, options: [.dotMatchesLineSeparators], greedy: true))
 
-        generators.append(regexToken(.comment, "\(quoteLookahead)<\\!--[\\s\\S]*?(?:-\\->|$)", options: [.dotMatchesLineSeparators, .caseInsensitive]))
+        generators.append(regexToken(.comment, #"<!--[\s\S]*?-->"#, options: [.dotMatchesLineSeparators, .caseInsensitive], greedy: true))
 
 
 
 
         return generators.compactMap( { $0 })
     }
 
-    func regexToken(_ type: BoopToken.TokenType, _ pattern:String, options: NSRegularExpression.Options = .caseInsensitive) -> TokenGenerator? {
+    func regexToken(_ type: BoopToken.TokenType, _ pattern:String, options: NSRegularExpression.Options = .caseInsensitive, greedy: Bool = false) -> TokenGenerator? {
         guard let regex = try? NSRegularExpression(pattern: pattern, options: options) else {
             return nil
         }
         let generator = RegexTokenGenerator(regularExpression: regex, tokenTransformer: { (range) -> Token in
-            return BoopToken(type: type, range: range)
+            return BoopToken(type: type, range: range, greedy: greedy)
         })
         return TokenGenerator.regex(generator)
     }

diff --git a/Boop/Boop/Editor/BoopToken.swift b/Boop/Boop/Editor/BoopToken.swift
@@ -9,9 +9,11 @@
 import Cocoa
 import SavannaKit
 
-class BoopToken: Token {
+class BoopToken: Token, CustomStringConvertible {
 
-    public enum TokenType {
+
+
+    public enum TokenType: String {
         case comment
         case string
         case attribute
@@ -26,15 +28,22 @@ class BoopToken: Token {
     // Plain tokens are not even parsed in the first place.
     var isPlain = false
 
-    var range: Range<String.Index>
+    var isActive = true
+    var isGreedy: Bool
+
+    var range: NSRange
     var type: BoopToken.TokenType
 
-    init(type:TokenType, range: Range<String.Index>) {
+    init(type:TokenType, range: NSRange, greedy: Bool = false) {
         self.range = range
         self.type = type
+        self.isGreedy = greedy
     }
 
 
+    var description: String {
+        return type.rawValue
+    }
 
 
 }
diff --git a/Boop/Boop/scripts/AndroidIOSStrings.js b/Boop/Boop/scripts/AndroidIOSStrings.js
@@ -2,10 +2,10 @@
   {
     "api":1,
     "name":"Android Strings to iOS Localizables",
-    "description":"Connverts Android Strings to iOS localizables",
+    "description":"Converts Android Strings to iOS localizables",
     "author":"Manuel Kunz (https://github.com/KunzManuel)",
-    "icon":"quote",
-    "tags":"string, android, ios"
+    "icon":"translation",
+    "tags":"string,android,ios"
   }
 **/
 

diff --git a/Boop/Boop/scripts/CountCharacters.js b/Boop/Boop/scripts/CountCharacters.js
@@ -9,8 +9,12 @@
 	}
 **/
 
+
+const { size } = require('@boop/lodash.boop')
+
 function main(input) {
 
-	input.postInfo(`${input.text.length} characters`)
+	input.postInfo(`${size(input.text)} characters`)
 
-}
+}
+
diff --git a/Boop/Boop/scripts/HTMLEncodeAll.js b/Boop/Boop/scripts/HTMLEncodeAll.js
@@ -0,0 +1,20 @@
+/**
+    {
+        "api":1,
+        "name":"HTML Encode all characters",
+        "description":"HTML Encodes every character in your text",
+        "author":"Ivan",
+        "icon":"HTML",
+        "tags":"html,encode,web,email",
+        "bias":-0.1
+    }
+**/
+
+function main(input) {
+    let str = input.text;
+    var out = "";
+    for (var i = 0; i < str.length; i++) {
+         out += `&#${str.charCodeAt(i)};`;
+    }
+    input.text = out;
+}
diff --git a/Boop/Boop/scripts/IOSAndroidStrings.js b/Boop/Boop/scripts/IOSAndroidStrings.js
@@ -4,8 +4,8 @@
     "name":"iOS Localizables to Android Strings",
     "description":"Converts iOS Localizables to Android Strings",
     "author":"Manuel Kunz (https://github.com/KunzManuel)",
-    "icon":"quote",
-    "tags":"string, android, ios"
+    "icon":"translation",
+    "tags":"string,android,ios"
   }
 **/
 

diff --git a/Boop/Boop/scripts/JSONtoYAML.js b/Boop/Boop/scripts/JSONtoYAML.js
@@ -0,0 +1,21 @@
+/**
+	{
+		"api":1,
+		"name":"JSON to YAML",
+		"description":"Converts JSON to YAML.",
+		"author":"Ivan",
+		"icon":"metamorphose",
+		"tags":"markup,convert"
+	}
+**/
+
+const yaml = require('@boop/js-yaml')
+
+function main(input) {
+	try {
+		input.text = yaml.safeDump(JSON.parse(input.text))
+	}
+	catch(error) {
+		input.postError("Invalid JSON")
+	}
+}