closes #101, editted toml regex to not use lookbehind

Lodestone-Team · Jan 19, 2023 · c6a8da7 · c6a8da7
1 parent 3e47de8
commit c6a8da7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/src/components/FileViewer.tsx b/src/components/FileViewer.tsx
@@ -248,7 +248,8 @@ export default function FileViewer() {
  monaco.languages.typescript.typescriptDefaults.setEagerModelSync(true);
  monaco.languages.register({ id: 'toml' });
  monaco.languages.setLanguageConfiguration('toml', toml.conf);
- monaco.languages.setMonarchTokensProvider('toml', toml.language);
+ if(toml.language)
+ monaco.languages.setMonarchTokensProvider('toml', toml.language);
  // monaco.languages.typescript.typescriptDefaults.setDiagnosticsOptions({
  // noSemanticValidation: true,
  // noSyntaxValidation: true,

diff --git a/src/utils/monaco-languages/toml.ts b/src/utils/monaco-languages/toml.ts
@@ -1,4 +1,5 @@
 import monaco from 'monaco-editor';
+import { negativeLookbehindSupported } from 'utils/util';
 
 type IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 type ILanguage = monaco.languages.IMonarchLanguage;
@@ -68,7 +69,8 @@ export const language = <ILanguage>{
 
  // array: [{ include: '@comments' }, { include: '@dataTypes' }],
 
- boolean: [[/(?<!\w)(true|false)(?!\w)/, 'constant.other.boolean.toml']],
+ // boolean: [[/(?<!\w)(true|false)(?!\w)/, 'constant.other.boolean.toml']],
+ boolean: [[/(true|false)(?!\w)/, 'constant.other.boolean.toml']],
 
  comments: [
  [
@@ -96,7 +98,8 @@ export const language = <ILanguage>{
 
  dateTimeWithTz: [
  [
- /(?<!\w)(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2}))(?!\w)/,
+ // /(?<!\w)(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2}))(?!\w)/,
+ /(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2}))/,
  'constant.other.datetime-with-timezone.toml',
  ],
  ],
@@ -112,14 +115,16 @@ export const language = <ILanguage>{
 
  float: [
  [
- /(?<!\w)([+-]?(0|([1-9](([0-9]|_[0-9])+)?))(?:(?:\.(0|([1-9](([0-9]|_[0-9])+)?)))?[eE][+-]?[1-9]_?[0-9]*|(?:\.[0-9_]*)))(?!\w)/,
+ // /(?<!\w)([+-]?(0|([1-9](([0-9]|_[0-9])+)?))(?:(?:\.(0|([1-9](([0-9]|_[0-9])+)?)))?[eE][+-]?[1-9]_?[0-9]*|(?:\.[0-9_]*)))(?!\w)/,
+ /([+-]?(0|([1-9](([0-9]|_[0-9])+)?))(?:(?:\.(0|([1-9](([0-9]|_[0-9])+)?)))?[eE][+-]?[1-9]_?[0-9]*|(?:\.[0-9_]*)))/,
  'constant.numeric.float.toml',
  ],
  ],
 
  integer: [
  [
- /(?<!\w)((?:[+-]?(0|([1-9](([0-9]|_[0-9])+)?))))(?!\w)/,
+ // /(?<!\w)((?:[+-]?(0|([1-9](([0-9]|_[0-9])+)?))))(?!\w)/,
+ /((?:[+-]?(0|([1-9](([0-9]|_[0-9])+)?))))/,
  'constant.numeric.integer.toml',
  ],
  ],

diff --git a/src/utils/util.ts b/src/utils/util.ts
@@ -777,3 +777,13 @@ export const openPort = async (port: number) => {
 export function cn(...inputs: ClassValue[]) {
  return twMerge(clsx(...inputs));
 }
+
+// detect if we are in a browser that supports negative lookbehind
+export const negativeLookbehindSupported = (() => {
+ try {
+ new RegExp('(?<!\\w)foo');
+ return true;
+ } catch (e) {
+ return false;
+ }
+})();