From eedbbc68ce3fa03294c5bd7c5df40f1b97d46b78 Mon Sep 17 00:00:00 2001 From: apoorva Date: Fri, 27 Nov 2020 12:37:39 -0800 Subject: [PATCH 1/2] Update cameligo.ts --- src/cameligo/cameligo.ts | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/cameligo/cameligo.ts b/src/cameligo/cameligo.ts index aba58ce5..55844c04 100644 --- a/src/cameligo/cameligo.ts +++ b/src/cameligo/cameligo.ts @@ -21,14 +21,20 @@ export const conf: languages.LanguageConfiguration = { { open: '[', close: ']' }, { open: '(', close: ')' }, { open: '<', close: '>' }, - { open: "'", close: "'" } + { open: "'", close: "'" }, + { open: "\"", close: "\""}, + { open: "(*", close: "*)"}, + { open: "begin", close: "end"}, ], surroundingPairs: [ { open: '{', close: '}' }, { open: '[', close: ']' }, { open: '(', close: ')' }, { open: '<', close: '>' }, - { open: "'", close: "'" } + { open: "'", close: "'" }, + { open: "\"", close: "\""}, + { open: "(*", close: "*)"}, + { open: "begin", close: "end"}, ] }; @@ -46,14 +52,18 @@ export const language = { keywords: [ 'abs', + 'assert', 'begin', + 'block', 'Bytes', + 'case', 'Crypto', 'Current', 'else', 'end', 'failwith', 'false', + 'for', 'fun', 'if', 'in', @@ -71,18 +81,21 @@ export const language = { 'operation', 'Operation', 'of', + 'record', 'Set', 'set', 'sender', + 'skip', 'source', 'String', 'then', + 'to', 'true', 'type', - 'with' + 'with', ], - typeKeywords: ['int', 'unit', 'string', 'tz'], + typeKeywords: ['int', 'unit', 'string', 'tz', 'nat', 'bool'], operators: [ '=', @@ -105,7 +118,11 @@ export const language = { '^', '%', '->', - '<-' + '<-', + '&&', + '||', + '!', + '' ], // we include these common regular expressions From e00244ddb53e3c4b02bc4f561bf7a3d7f363f601 Mon Sep 17 00:00:00 2001 From: apoorva Date: Fri, 27 Nov 2020 15:06:38 -0800 Subject: [PATCH 2/2] update --- src/cameligo/cameligo.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/cameligo/cameligo.ts b/src/cameligo/cameligo.ts index 55844c04..6bdd3f73 100644 --- a/src/cameligo/cameligo.ts +++ b/src/cameligo/cameligo.ts @@ -24,7 +24,6 @@ export const conf: languages.LanguageConfiguration = { { open: "'", close: "'" }, { open: "\"", close: "\""}, { open: "(*", close: "*)"}, - { open: "begin", close: "end"}, ], surroundingPairs: [ { open: '{', close: '}' }, @@ -34,7 +33,6 @@ export const conf: languages.LanguageConfiguration = { { open: "'", close: "'" }, { open: "\"", close: "\""}, { open: "(*", close: "*)"}, - { open: "begin", close: "end"}, ] }; @@ -53,14 +51,12 @@ export const language = { keywords: [ 'abs', 'assert', - 'begin', 'block', 'Bytes', 'case', 'Crypto', 'Current', 'else', - 'end', 'failwith', 'false', 'for', @@ -121,8 +117,6 @@ export const language = { '<-', '&&', '||', - '!', - '' ], // we include these common regular expressions