update

cisco-ios.sublime-syntax

@@ -107,6 +107,7 @@ variables:
       (?:class-map)|
       (?:clock)|
       (?:control-plane)|
+      (?:conf(?:igure)?\s+t(?:erminal)?)|
       (?:diagnostic)|
       (?:enable)|
       (?:exception)|
@@ -1682,7 +1683,12 @@ contexts:
             (?:(ip\s+address)\s+({{ip}})\s+({{subnet_mask}})(\s+secondary)?)|
             (shut(?:down)?)|
             (ipv6\s+enable)|
-            (?:(channel-group)\s+(\d+)\s+(mode)\s+(active|on))|
+            (?:(channel-group)\s+(\d+)\s+(mode)\s+
+              (
+                (?:active)|
+                (?:on)
+              )
+            )|
             (?:(speed)\s+(auto)|(\d+))|
             (?:(ip\s+nat)\s+((?:inside)|(?:outside)))|
             (?:(duplex)\s+((?:auto)|(?:half)|(?:auto)))|
@@ -1708,7 +1714,14 @@ contexts:
             (?:
               (spanning-tree)\s+
               (?:
-                (portfast)(\s+edge)?
+                (portfast)
+                (?:
+                  \s+
+                  (
+                    (?:edge)|
+                    (?:trunk)
+                  )
+                )?
               )|(?:
                 (bpduguard)\s+(?:(enable)|(disable))
               )
@@ -1720,7 +1733,15 @@ contexts:
                 (?:output)
               )
               \s+(\S+)
-            )
+            )|
+            (?:
+              (logging\s+event)\s+
+              (?:
+                (link-status)|
+                (trunk-status)
+              )
+            )|
+            (?:(vpc)\s+(\d+))
           )
         captures:
           1: comment.line                 # Description
@@ -1793,6 +1814,11 @@ contexts:
           68: support.constant            # service-policy
           69: support.constant            # service-policy input/output
           70: string.unquoted             # service-policy input/output name
+          71: support.constant            # logging event
+          72: support.constant            # logging event link-status
+          73: support.constant            # logging event trunk-status
+          74: support.constant            # vpc
+          75: constant.numeric            # vpc id
       - include: pop_on_configure_terminal_context
       # - include: partials
 

docs/index.rst

@@ -9,20 +9,30 @@ Network Tech Documentation
 Quick Start
 -----------
 
+1. `Install Sublime Text 3 <https://www.sublimetext.com/3>`_
 
-1. `Get Sublime Text 3 <https://www.sublimetext.com/3>`_
+2. Install Package Control 
+      :menuselection:`Tools --> Command Pallet`
+
+      ⌨ :kbd:`Install Package Control`
 
-2. `Setup Package Manager <https://packagecontrol.io/installation>`_
+      ⌨ :kbd:`<enter>`
+3. Install the package:
+      :menuselection:`Tools --> Command Pallet`
+
+      ⌨ :kbd:`Package Control: Install Package`
 
-3. Open Sublime Text: :menuselection:`Tools --> Command Pallet`
+      ⌨ :kbd:`<enter>`
+
+      ⌨ :kbd:`Network Tech`
 
-4. `Package Control: Install Package` :kbd:`enter`
+      ⌨ :kbd:`<enter>`
+4. Enable the syntax highlighing
+      :menuselection:`Tools --> Command Pallet`
 
-5. `Network Tech` :kbd:`enter`
+      ⌨ :kbd:`Set Syntax: Cisco IOS`
 
-6. :menuselection:`Tools --> Command Pallet`
-
-7. `Set Syntax: Cisco IOS` :kbd:`enter`
+      ⌨ :kbd:`<enter>`
 
 .. image:: /_images/cisco_ios_demo.gif
 

docs/install.rst

@@ -1,16 +1,24 @@
 Install
 ======
 
-1. `Get Sublime Text 3 <https://www.sublimetext.com/3>`_
+1. `Install Sublime Text 3 <https://www.sublimetext.com/3>`_
 
-2. `Setup Package Manager <https://packagecontrol.io/installation>`_
+2. Install Package Control 
+      :menuselection:`Tools --> Command Pallet`
+
+      ⌨ :kbd:`Install Package Control`
 
-3. Open Sublime Text: :menuselection:`Tools --> Command Pallet`
+      ⌨ :kbd:`<enter>`
+3. Install the package:
+      :menuselection:`Tools --> Command Pallet`
+
+      ⌨ :kbd:`Package Control: Install Package`
 
-4. `Package Control: Install Package` :kbd:`enter`
-
-5. `Network Tech` :kbd:`enter`
+      ⌨ :kbd:`<enter>`
+      
+      ⌨ :kbd:`Network Tech`
 
+      ⌨ :kbd:`<enter>`
 .. note::
 
     Sublime Text 2 is not supported

docs/jumping.rst

@@ -1,7 +1,7 @@
 Jumping
 =======
 
-Quickly jump around large configuration using Symbols :kbd:`ctrl-r` or  :menuselection:`Goto --> Goto Symbol...`
+Quickly jump around large configuration using Symbols ⌨ :kbd:`<ctrl>+<r>` or  :menuselection:`Goto --> Goto Symbol...`
 
 .. image:: /_images/jumping.gif
 

docs/snippets.rst

@@ -6,7 +6,7 @@ Configuration snippets and autocompetions are suggested based off the syntax and
 Mask Conversions
 ----------------
 
-Manually Trigger the Completions Popup: :kbd:`ctrl-space`
+Manually Trigger the Completions Popup: ⌨ :kbd:`<ctrl>+<space>`
 
 .. image:: /_images/mask_conversions_demo.gif
 

docs/syntax.rst

@@ -10,7 +10,7 @@ Supported configurations:
 
 Set the syntax from the command pallet
 
-    1. :menuselection:`Tools --> Command Pallet`  **OR**  :kbd:`ctrl+shift+p`
+    1. :menuselection:`Tools --> Command Pallet`  **OR**  ⌨ :kbd:`ctrl+shift+p`
 
-    2. `Set Syntax: Cisco IOS` :kbd:`enter`
+    2. `Set Syntax: Cisco IOS` :kbd:`<enter>`
 

messages/2.17.0.md

@@ -0,0 +1,19 @@
+# [2.17.0] - 2018-10-02
+
+## Added
+
+  - Cisco IOS
+
+    - Interface Block
+
+        - spanning-tree portfast trunk
+
+        - logging event link-status
+
+        - logging event trunk-status
+        
+        - vpc id
+
+## Fixed
+
+    - Improved "configure terminal" command handling

tests/syntax_test_cisco_ios.cisco-ios

@@ -259,11 +259,14 @@ interface range GigabitEthernet1/1-2
   standby 1 preempt
   standby 1 preempt delay minimum 300 reload 300
   standby 2 ipv6 autoconfig
-  standby 2 ipv6 ::1
+  standby 2 ipv6 ::1/64
   standby 1 track 1 decrement 10
   ipv6 enable
+  logging event link-status
+  logging event trunk-status
   spanning-tree portfast
   spanning-tree portfast edge
+  spanning-tree portfast trunk
   shut
   no switchport
   no shutdown
@@ -274,6 +277,7 @@ interface range GigabitEthernet1/1-2
   service-policy input SOMETHING
   exit
 
+conf t
 
 route-map ROUTE_MAP_NAME permit 10
  match ip address prefix-list PREFIX-LIST