Merge branch 'develop'

1c.tmLanguage

@@ -63,6 +63,10 @@
         </dict>
         <key>patterns</key>
         <array>
+          <dict>
+            <key>include</key>
+            <string>#annotations</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#basic</string>
@@ -263,25 +267,8 @@
         <string>(?i:&amp;(НаКлиенте((НаСервере(БезКонтекста)?)?)|AtClient((AtServer(NoContext)?)?)|НаСервере(БезКонтекста)?|AtServer(NoContext)?))</string>
       </dict>
       <dict>
-        <key>comment</key>
-        <string>Annotations</string>
-        <key>begin</key>
-        <string>(?i)(&amp;(Перед|Before|После|After|Вместо|Around))\s*\((.*)\)</string>
-        <key>beginCaptures</key>
-        <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>storage.type.annotation.bsl</string>
-          </dict>
-          <key>3</key>
-          <dict>
-            <key>name</key>
-            <string>string.quoted.double.bsl</string>
-          </dict>
-        </dict>
-        <key>end</key>
-        <string>$</string>
+        <key>include</key>
+        <string>#annotations</string>
       </dict>
       <dict>
         <key>name</key>
@@ -1126,6 +1113,80 @@ WSСсылки|WSReferences|
           </dict>
         </array>
       </dict>
+      <key>annotations</key>
+      <dict>
+        <key>patterns</key>
+        <array>
+          <dict>
+            <key>comment</key>
+            <string>Annotations with parameters</string>
+            <key>begin</key>
+            <string>(?i)(&amp;([a-zа-яё0-9_]+))\s*(\()</string>
+            <key>beginCaptures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>storage.type.annotation.bsl</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.bracket.begin.bsl</string>
+              </dict>
+            </dict>
+            <key>end</key>
+            <string>(\))</string>
+            <key>endCaptures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.bracket.end.bsl</string>
+              </dict>
+            </dict>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#basic</string>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.assignment.bsl</string>
+                <key>match</key>
+                <string>(=)</string>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>invalid.illegal.bsl</string>
+                <key>match</key>
+                <string>(?&lt;=[^\wа-яё\.]|^)((?&lt;==)(?i)[a-zа-яё0-9_]+)(?=[^\wа-яё\.]|$)</string>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>invalid.illegal.bsl</string>
+                <key>match</key>
+                <string>(?&lt;=[^\wа-яё\.]|^)((?&lt;==\s)\s*(?i)[a-zа-яё0-9_]+)(?=[^\wа-яё\.]|$)</string>
+              </dict>
+              <dict>
+                <key>name</key>
+                <string>variable.annotation.bsl</string>
+                <key>match</key>
+                <string>(?i)[a-zа-яё0-9_]+</string>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>comment</key>
+            <string>Annotations without parameters</string>
+            <key>name</key>
+            <string>storage.type.annotation.bsl</string>
+            <key>match</key>
+            <string>(?i)(&amp;([a-zа-яё0-9_]+))</string>
+          </dict>
+        </array>
+      </dict>
     </dict>
   </dict>
 </plist>

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.6.5
+
+* Добавлена подсветка аннотаций для OneScript
+
 ## 1.6.4
 
 * Исправлена подсветка сравнений в условиях при использовании переносов строки