solidity

Author: DmitrySharabin

src/languages/solidity.js

@@ -1,25 +1,11 @@
-import { insertBefore } from '../util/language-util.js';
 import clike from './clike.js';
 
 /** @type {import('../types.d.ts').LanguageProto<'solidity'>} */
 export default {
 	id: 'solidity',
 	base: clike,
 	alias: 'sol',
-	grammar ({ base }) {
-		insertBefore(base, 'keyword', {
-			'builtin':
-				/\b(?:address|bool|byte|u?int(?:8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)?|string|bytes(?:[1-9]|[12]\d|3[0-2])?)\b/,
-		});
-
-		insertBefore(base, 'number', {
-			'version': {
-				pattern: /([<>]=?|\^)\d+\.\d+\.\d+\b/,
-				lookbehind: true,
-				alias: 'number',
-			},
-		});
-
+	grammar () {
 		return {
 			'class-name': {
 				pattern: /(\b(?:contract|enum|interface|library|new|struct|using)\s+)(?!\d)[\w$]+/,
@@ -28,6 +14,19 @@ export default {
 			'keyword':
 				/\b(?:_|anonymous|as|assembly|assert|break|calldata|case|constant|constructor|continue|contract|default|delete|do|else|emit|enum|event|external|for|from|function|if|import|indexed|inherited|interface|internal|is|let|library|mapping|memory|modifier|new|payable|pragma|private|public|pure|require|returns?|revert|selfdestruct|solidity|storage|struct|suicide|switch|this|throw|using|var|view|while)\b/,
 			'operator': /=>|->|:=|=:|\*\*|\+\+|--|\|\||&&|<<=?|>>=?|[-+*/%^&|<>!=]=?|[~?]/,
+			$insertBefore: {
+				'keyword': {
+					'builtin':
+						/\b(?:address|bool|byte|u?int(?:8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)?|string|bytes(?:[1-9]|[12]\d|3[0-2])?)\b/,
+				},
+				'number': {
+					'version': {
+						pattern: /([<>]=?|\^)\d+\.\d+\.\d+\b/,
+						lookbehind: true,
+						alias: 'number',
+					},
+				},
+			},
 		};
 	},
 };