Merge branch 'dev-master': some control snippets refactor

Author: h4kst3r

.vscodeignore

@@ -2,3 +2,4 @@
 .vscode-test/**
 .gitignore
 vsc-extension-quickstart.md
+*.php

README.md

@@ -4,20 +4,20 @@
 ![Snippets](https://img.shields.io/badge/Type-Snippets-yellow.svg)
 ![PHP7](https://img.shields.io/badge/PHP-%5E7.0-blue.svg)
 ![PHP5](https://img.shields.io/badge/PHP-%5E5.4-blue.svg)
+[![SemVer](https://img.shields.io/badge/SemVer-1.1.3-%23B71C1C.svg)](https://github.com/h4kst3r/php-awesome-snippets/blob/master/CHANGELOG.md)
+[![MIT](https://img.shields.io/badge/License-MIT-%2300C853.svg)](https://github.com/h4kst3r/php-awesome-snippets/blob/master/LICENSE)
+
 [![PSR-1](https://img.shields.io/badge/Standard-PSR--1-%2326A69A.svg)](https://www.php-fig.org/psr/psr-1/)
 [![PSR-2](https://img.shields.io/badge/Standard-PSR--2-%2326A69A.svg)](https://www.php-fig.org/psr/psr-2/)
 [![PSR-12](https://img.shields.io/badge/Standard-PSR--12-%2326A69A.svg)](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md)
-[![MIT](https://img.shields.io/badge/License-MIT-%2300C853.svg)](https://github.com/h4kst3r/php-awesome-snippets/blob/master/LICENSE)
 
-[![SemVer](https://img.shields.io/badge/SemVer-1.1.2-%23B71C1C.svg)](https://github.com/h4kst3r/php-awesome-snippets/blob/master/CHANGELOG.md)
-
-This [VScode extension](https://marketplace.visualstudio.com/items?itemName=hakcorp.php-awesome-snippets) provide a fullset of snippets for PHP devs. It's pretty simple !
+**This [VScode extension](https://marketplace.visualstudio.com/items?itemName=hakcorp.php-awesome-snippets) provide a fullset of snippets for PHP devs. It's pretty simple !**
 
 You can use it to avoid wasting time typing Class blocks, function signatures or other common PHP statements.
 
 ![Demo PHP Awesome Snippets](img/snipdemo.gif)
 
-The code generated is as compliant as possible with [PSR-1](https://www.php-fig.org/psr/psr-1/), [PSR-2](https://www.php-fig.org/psr/psr-2/) and [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md) (*Review* stage) coding standard provided by [PHP-FIG](https://www.php-fig.org/).
+The code generated is **as compliant as possible** with [PSR-1](https://www.php-fig.org/psr/psr-1/), [PSR-2](https://www.php-fig.org/psr/psr-2/) and [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md) (*Review* stage) coding standards provided by [PHP-FIG](https://www.php-fig.org/).
 
 Snippets are PHP7 oriented (type hinting and return type) but PHP5 compatibility is also provided (see [Functions](#function-snip) and [Methods](#method-snip) sections).
 
@@ -28,7 +28,7 @@ Type a snippet (or part of it), press `Enter` or `Tab` (if `editor.tabCompletion
 
 > ***Tip :*** Snippets provided in this extension support `tab` to next/previous placeholder.
 
-These snippets are meant to work in *PHP* context (VScode file). However there are also available in *Plain Text* files for convenience and PHP tags are available in *HTML* ones.
+These snippets are meant to work in **PHP context** (VScode file). However there are also available in **Plain Text context** for convenience and PHP tags are available in **HTML** one.
 
 ## Features
 
@@ -73,7 +73,7 @@ Placeholders are quite *'easy to use'* though some need optimizations.
 | kv | `'key' => value,` **[1]** |
 | va | `value, ` **[1]** |
 
-* **[1]** Addon snippet: use with `arr` or `ark` snippet to add `value` or `key => value` if needed.
+* **[1]** Addon snippet : use with `arr` or `ark` snippet to add `value` or `key => value` if needed.
 
 ----
 ### Statements and common functions calls
@@ -99,7 +99,7 @@ Placeholders are quite *'easy to use'* though some need optimizations.
 | fna | `function (Type $args): void {...}` |
 | fnu | `function (Type $args) use ($vars): void {...}` |
 
-***Tip :*** You can call `functions` snippets above without type hinting and return type (**PHP5 compatible**) by using **`-`** as prefix.
+***Tip :*** You can call `functions` snippets above without type hinting and return type (**PHP5 compatibility**) by using **`-`** as prefix.
 > * `-fna` for `function ($args) {...}` *(anonymous function block)*
 
 ----
@@ -114,15 +114,15 @@ Placeholders are quite *'easy to use'* though some need optimizations.
 | cs | `case 'label': ... break;` **[1]** |
 | tern | `condition ? if_true : if_false;` |
 
-* **[1]** Addon snippet: use with `sw` snippet to add `case` if needed.
+* **[1]** Addon snippet : use with `sw` snippet to add `case` if needed.
 
-***Tip :*** The others `if` `else` forms are also available if needed:
+***Tip :*** Other `if ... else` form is also available if needed:
 
 > | Snippet | Output |
 > | --- | --- |
-> | ifend | `if (condition): ... endif;` |
-> | ifelend | `if (condition): ... else: ... endif;` |
-> | ifelifend | `if (condition): ... elseif (condition): ... else: ... endif;` |
+> | ifen | `if (condition): ... endif;` |
+> | ifelen | `if (condition): ... else: ... endif;` |
+> | ifelifen | `if (condition): ... elseif (condition): ... else: ... endif;` |
 
 ----
 ### Loops structures
@@ -135,7 +135,7 @@ Placeholders are quite *'easy to use'* though some need optimizations.
 | wl | `while ($variable <= $limit) {...}` |
 | dowl | `do {...} while ($variable <= $limit);` |
 
-***Tip :*** The others loop forms are also available if needed: 
+***Tip :*** Other loops form is also available if needed: 
 
 > | Snippet | Output |
 > | --- | --- |
@@ -191,7 +191,7 @@ Placeholders are quite *'easy to use'* though some need optimizations.
 > * `fpubsf` for `final public static function methodName(Type $args): void {...}` 
 
 ***Tip :*** You can call `methods` snippets above without type hinting 
-and return type (**PHP5 compatible**) by using **`-`** as prefix.
+and return type (**PHP5 compatibility**) by using **`-`** as prefix.
 > * `-apubf` for `abstract public function methodName(parameters) {...}`
 
 ----
@@ -205,14 +205,14 @@ and return type (**PHP5 compatible**) by using **`-`** as prefix.
 | fy | `finally {...}` **[2]** |
 | thr | `throw new SomeException("Error statement");` |
 
-* **[1]** Addon snippet: use with `tryc` or `tryf` snippet to add `catch` if needed.
-* **[2]** Addon snippet: use with `tryc` snippet to add `finally` if needed.
+* **[1]** Addon snippet : use with `tryc` or `tryf` snippet to add `catch` if needed.
+* **[2]** Addon snippet : use with `tryc` snippet to add `finally` if needed.
 
 ## Requirements
 
 All you need is VScode installed on your machine.
 
-* Install the extension from extension menu.
+* Install the extension from `Extensions` menu.
 
 * You can also press `F1` then type:
 
@@ -221,6 +221,7 @@ All you need is VScode installed on your machine.
 ## <a id="ext-settings"></a>Extension Settings
 
 The VScode default behavior deactivate IntelliSense suggestions when you're filling placeholders. However if you want to use completion and snippets inside placeholders :
+
 * Open your settings.json file ( **{ }** icon at the top right corner of the settings tab).
 
 * Add this line anywhere you want: `"editor.suggest.snippetsPreventQuickSuggestions": false`
@@ -229,7 +230,9 @@ Now you can call snippets and any suggestion in placeholders without typing `Ctr
 
 ## Known Issues
 
-Sometimes IntelliSense freezes loading or simply don't select the called snippet. Backspace and try again, it should work.
+If suggestions menu does not open, press `Ctrl+space` to open it manually.
+
+Sometimes IntelliSense freezes loading or simply doesn't select the called snippet. Backspace and try again, it should work.
 
 ## Release Notes
 

package.json

@@ -12,10 +12,11 @@
         "Programming Languages"
     ],
     "keywords": [
-        "PHP",
-        "Snippets",
-        "Productivity",
-        "PHP Snippets"
+        "snippets",
+        "productivity",
+        "coding",
+        "php7",
+        "psr"
     ],
     "icon": "img/php-awesome-icon.png",
     "galleryBanner": {

snippets/control.json

@@ -1,6 +1,6 @@
 {
     "If ... endif": {
-        "prefix": "ifend",
+        "prefix": "ifen",
         "body": [
             "if (${1:condition}):",
             "\t${0:# code...}",
@@ -9,7 +9,7 @@
         "description": "If endif block"
     },
     "If ... else ... endif": {
-        "prefix": "ifelend",
+        "prefix": "ifelen",
         "body": [
             "if (${1:condition}):",
             "\t${2:# code...}",
@@ -20,7 +20,7 @@
         "description": "If else endif block"
     },
     "If ... elseif ... else ... endif": {
-        "prefix": "ifelifend",
+        "prefix": "ifelifen",
         "body": [
             "if (${1:condition}):",
             "\t${2:# code...}",