Separate Visual Basic into VB.NET, VBA/VB6 and VBScript (#4725)

* Fix for #2418 (WIP)

* Fix for #2418 (WIP)

* Remove mistaken aliases

* Sort language names; add/move samples

* Fix language order; update VBScipt color

* Update colors

* Update VBA/VB6 color

* Reorder languages

* PR fixes

* Rename VBA to Visual Basic for Applications

* Update language IDs; go back to acronym

* Fixes for failing tests

lib/linguist/heuristics.yml

@@ -462,7 +462,7 @@ disambiguations:
   rules:
   - language: Vim script
     pattern: '^UseVimball'
-  - language: Visual Basic
+  - language: VBA
 - extensions: ['.w']
   rules:
   - language: OpenEdge ABL

lib/linguist/languages.yml

@@ -5492,6 +5492,34 @@ V:
   codemirror_mode: go
   codemirror_mime_type: text/x-go
   language_id: 603371597
+VBA:
+  type: programming
+  color: "#867db1"
+  extensions:
+  - ".bas"
+  - ".cls"
+  - ".frm"
+  - ".frx"
+  - ".vba"
+  tm_scope: source.vbnet
+  aliases:
+  - vb6
+  - visual basic 6
+  - visual basic for applications
+  ace_mode: text
+  codemirror_mode: vb
+  codemirror_mime_type: text/x-vb
+  language_id: 399230729
+VBScript:
+  type: programming
+  color: "#15dcdc"
+  extensions:
+  - ".vbs"
+  tm_scope: source.vbnet
+  ace_mode: text
+  codemirror_mode: vbscript
+  codemirror_mime_type: text/vbscript
+  language_id: 408016005
 VCL:
   type: programming
   color: "#148AA8"
@@ -5573,22 +5601,18 @@ Vim script:
   - vimrc
   ace_mode: text
   language_id: 388
-Visual Basic:
+Visual Basic .NET:
   type: programming
   color: "#945db7"
   extensions:
   - ".vb"
-  - ".bas"
-  - ".cls"
-  - ".frm"
-  - ".frx"
-  - ".vba"
   - ".vbhtml"
-  - ".vbs"
-  tm_scope: source.vbnet
   aliases:
-  - vb.net
+  - visual basic
   - vbnet
+  - vb .net
+  - vb.net
+  tm_scope: source.vbnet
   ace_mode: text
   codemirror_mode: vb
   codemirror_mime_type: text/x-vb