Merge pull request #1 from sambacha/patch-2

Author: sambacha

package-lock.json

@@ -12,7 +12,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://[email protected]/pospi/highlightjs-solidity.git"
+    "url": "git+ssh://[email protected]/highlightjs/highlightjs-solidity.git"
   },
   "keywords": [
     "Solidity",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "eslint": "^8.57.0",
     "eslint-config-standard": "^17.1.0",
-    "highlight.js": "^11.9.0",
+    "highlight.js": "^10.7.3",
     "highlightjs": "^9.16.2",
     "mocha": "^10.3.0",
     "parse5": "^7.1.2"

package.json

@@ -63,9 +63,9 @@ var SOL_ASSEMBLY_KEYWORDS = {
         'pc pop ' +
         'dup1 dup2 dup3 dup4 dup5 dup6 dup7 dup8 dup9 dup10 dup11 dup12 dup13 dup14 dup15 dup16 ' +
         'swap1 swap2 swap3 swap4 swap5 swap6 swap7 swap8 swap9 swap10 swap11 swap12 swap13 swap14 swap15 swap16 ' +
-        'mload mstore mstore8 sload sstore msize tload tstore ' +
+        'mload mstore mstore8 sload sstore msize tload tstore mcopy ' +
         'gas address balance selfbalance caller callvalue ' +
-        'calldataload calldatasize calldatacopy codesize codecopy extcodesize extcodecopy returndatasize returndatacopy extcodehash mcopy ' +
+        'calldataload calldatasize calldatacopy codesize codecopy extcodesize extcodecopy returndatasize returndatacopy extcodehash ' +
         'create create2 call callcode delegatecall staticcall ' +
         'log0 log1 log2 log3 log4 ' +
         'chainid origin gasprice basefee blobbasefee blockhash blobhash coinbase timestamp number difficulty prevrandao gaslimit ',

src/common.js

@@ -1,3 +1,13 @@
+/*
+Language: Solidity
+Requires: solidity.js, yul.js
+Author: SEE AUTHOR
+Contributors: SEE CONTRIBUTORS
+Description: A statically-typed curly-braces programming language designed for developing smart contracts that run on Ethereum.
+Website: https://docs.soliditylang.org/en/latest/grammar.html
+*/
+
+
 /**
  * highlight.js Solidity syntax highlighting definition
  *
@@ -8,8 +18,8 @@
  * @since:   2016-07-01
  */
 
-const solidityGrammar = require("./languages/solidity.js");
-const yulGrammar = require("./languages/yul.js");
+const solidityGrammar = require("./languages/solidity");
+const yulGrammar = require("./languages/yul");
 
 module.exports = function(hljs) {
     hljs.registerLanguage('solidity', solidityGrammar);

src/index.js

@@ -12,7 +12,7 @@ const {
     SOL_ASSEMBLY_KEYWORDS,
     baseAssembly,
     isNegativeLookbehindAvailable
-} = require("../common.js");
+} = require("../common");
 
 function hljsDefineYul(hljs) {