Merge pull request #3 from hyperoslo/fix/swift3

Update snippets

Author: onmyway133

README.md

@@ -47,9 +47,11 @@ var <#name#>: String? {
 
 ```swift
 if #available(iOS 9, *) {
-  <#code#>
+    <#API available statements#>
+} else if #available(macOS 10.12, *) {
+    <#API available statements#>
 } else {
-  <#code#>
+    <#fallback statements#>
 }
 ```
 
@@ -128,51 +130,54 @@ subscript(<#name#>: <#type#>) -> <#type#> {
 }
 ```
 
-- swifttypealias
+- swiftguardself
 
 ```swift
-typealias <#alias#> = <#existingtype#>
+guard let `self` = self else {
+  return
+}
 ```
 
 - swiftuitableviewdatasource
  ```swift
-func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+func numberOfSections(in tableView: UITableView) -> Int {
   return <#count#>
 }
 
-func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
   return <#count#>
 }
 
-func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
   <#code#>
 }
  ```
 
 - swiftuicollectionviewdatasource
 
 ```swift
-func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int {
-  <#count#>
+func numberOfSections(in collectionView: UICollectionView) -> Int {
+  return <#count#>
 }
 
-func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-  <#count#>
+func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+  return <#count#>
 }
 
-func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
+func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
   <#code#>
 }
 ```
 
 - swiftuipickerviewdatasource
+
 ```swift
-func numberOfComponentsInPickerView(pickerView: UIPickerView) -> Int {
-  <#count#>
+func numberOfComponents(in pickerView: UIPickerView) -> Int {
+  return <#count#>
 }
 
-func pickerView(pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
-  <#count#>
+func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+  return <#count#>
 }
 ```
 

Snippets/swiftcheckavailability.codesnippet

@@ -10,10 +10,12 @@
 	</array>
 	<key>IDECodeSnippetContents</key>
 	<string>if #available(iOS 9, *) {
-    &lt;#code#&gt;
-    } else {
-    &lt;#code#&gt;
-    }</string>
+    &lt;#API available statements#&gt;
+} else if #available(macOS 10.12, *) {
+    &lt;#API available statements#&gt;
+} else {
+    &lt;#fallback statements#&gt;
+}</string>
 	<key>IDECodeSnippetIdentifier</key>
 	<string>286EE23E-804C-448C-84C2-437F71E31054</string>
 	<key>IDECodeSnippetLanguage</key>

Snippets/swifttypealias.codesnippet renamed to Snippets/swiftguardself.codesnippet

@@ -3,19 +3,21 @@
 <plist version="1.0">
 <dict>
 	<key>IDECodeSnippetCompletionPrefix</key>
-	<string>swifttypealias</string>
+	<string>swiftguardself</string>
 	<key>IDECodeSnippetCompletionScopes</key>
 	<array>
-		<string>ClassImplementation</string>
+		<string>All</string>
 	</array>
 	<key>IDECodeSnippetContents</key>
-	<string>typealias &lt;#alias#&gt; = &lt;#existingtype#&gt;</string>
+	<string>guard let `self` = self else {
+  return
+}</string>
 	<key>IDECodeSnippetIdentifier</key>
-	<string>5A840BC7-D419-4A82-A069-E9DDC4F8BA20</string>
+	<string>FC0D62B1-F64B-47EB-A912-E0E6172B498A</string>
 	<key>IDECodeSnippetLanguage</key>
 	<string>Xcode.SourceCodeLanguage.Swift</string>
 	<key>IDECodeSnippetTitle</key>
-	<string>swifttypealias</string>
+	<string>swiftguardself</string>
 	<key>IDECodeSnippetUserSnippet</key>
 	<true/>
 	<key>IDECodeSnippetVersion</key>

Snippets/swiftuicollectionviewdatasource.codesnippet

@@ -9,17 +9,17 @@
 		<string>ClassImplementation</string>
 	</array>
 	<key>IDECodeSnippetContents</key>
-	<string>func numberOfSectionsInCollectionView(collectionView: UICollectionView) -&gt; Int {
-    &lt;#count#&gt;
-  }
+	<string>func numberOfSections(in collectionView: UICollectionView) -&gt; Int {
+  return &lt;#count#&gt;
+}
 
-  func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -&gt; Int {
-    &lt;#count#&gt;
-  }
+func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -&gt; Int {
+  return &lt;#count#&gt;
+}
 
-  func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -&gt; UICollectionViewCell {
-    &lt;#code#&gt;
-  }</string>
+func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -&gt; UICollectionViewCell {
+  &lt;#code#&gt;
+}</string>
 	<key>IDECodeSnippetIdentifier</key>
 	<string>F932ECD9-8F67-4C60-98CF-071204B1FF17</string>
 	<key>IDECodeSnippetLanguage</key>

Snippets/swiftuipickerviewdatasource.codesnippet

@@ -9,13 +9,13 @@
 		<string>ClassImplementation</string>
 	</array>
 	<key>IDECodeSnippetContents</key>
-	<string>func numberOfComponentsInPickerView(pickerView: UIPickerView) -&gt; Int {
-    &lt;#count#&gt;
-  }
+	<string>func numberOfComponents(in pickerView: UIPickerView) -&gt; Int {
+  return &lt;#count#&gt;
+}
 
-  func pickerView(pickerView: UIPickerView, numberOfRowsInComponent component: Int) -&gt; Int {
-    &lt;#count#&gt;
-  }</string>
+func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -&gt; Int {
+  return &lt;#count#&gt;
+}</string>
 	<key>IDECodeSnippetIdentifier</key>
 	<string>221CE04F-5B1F-4A86-8EB3-52FAEF45CF0A</string>
 	<key>IDECodeSnippetLanguage</key>

Snippets/swiftuitableviewdatasource.codesnippet

@@ -9,17 +9,17 @@
 		<string>ClassImplementation</string>
 	</array>
 	<key>IDECodeSnippetContents</key>
-	<string>func numberOfSectionsInTableView(tableView: UITableView) -&gt; Int {
-    return &lt;#count#&gt;
-  }
+	<string>func numberOfSections(in tableView: UITableView) -&gt; Int {
+  return &lt;#count#&gt;
+}
 
-  func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -&gt; Int {
-    return &lt;#count#&gt;
-  }
+func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -&gt; Int {
+  return &lt;#count#&gt;
+}
 
-  func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -&gt; UITableViewCell {
-    &lt;#code#&gt;
-  }</string>
+func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -&gt; UITableViewCell {
+  &lt;#code#&gt;
+}</string>
 	<key>IDECodeSnippetIdentifier</key>
 	<string>CE2F717F-36C5-4A9F-A8D4-D8870E5572EC</string>
 	<key>IDECodeSnippetLanguage</key>