# HG changeset patch # User wenzelm # Date 1606602977 -3600 # Node ID f6bf655547646b0ec78d9997bcee28f2494649ed # Parent 47ffeb3448f46481889e139e1b89b797dcc823bc clarified files; diff -r 47ffeb3448f4 -r f6bf65554764 src/Pure/System/isabelle_tool.scala --- a/src/Pure/System/isabelle_tool.scala Sat Nov 28 23:30:25 2020 +0100 +++ b/src/Pure/System/isabelle_tool.scala Sat Nov 28 23:36:17 2020 +0100 @@ -204,7 +204,7 @@ Update_Header.isabelle_tool, Update_Then.isabelle_tool, Update_Theorems.isabelle_tool, - isabelle.vscode.Grammar.isabelle_tool, + isabelle.vscode.TextMate_Grammar.isabelle_tool, isabelle.vscode.Language_Server.isabelle_tool) class Admin_Tools extends Isabelle_Scala_Tools( diff -r 47ffeb3448f4 -r f6bf65554764 src/Pure/build-jars --- a/src/Pure/build-jars Sat Nov 28 23:30:25 2020 +0100 +++ b/src/Pure/build-jars Sat Nov 28 23:36:17 2020 +0100 @@ -205,11 +205,11 @@ src/Tools/VSCode/src/build_vscode.scala src/Tools/VSCode/src/channel.scala src/Tools/VSCode/src/dynamic_output.scala - src/Tools/VSCode/src/grammar.scala src/Tools/VSCode/src/language_server.scala src/Tools/VSCode/src/lsp.scala src/Tools/VSCode/src/preview_panel.scala src/Tools/VSCode/src/state_panel.scala + src/Tools/VSCode/src/textmate_grammar.scala src/Tools/VSCode/src/vscode_model.scala src/Tools/VSCode/src/vscode_rendering.scala src/Tools/VSCode/src/vscode_resources.scala diff -r 47ffeb3448f4 -r f6bf65554764 src/Tools/VSCode/src/build_vscode.scala --- a/src/Tools/VSCode/src/build_vscode.scala Sat Nov 28 23:30:25 2020 +0100 +++ b/src/Tools/VSCode/src/build_vscode.scala Sat Nov 28 23:36:17 2020 +0100 @@ -19,12 +19,12 @@ def build_grammar(options: Options, progress: Progress = new Progress) { - val logic = Grammar.default_logic + val logic = TextMate_Grammar.default_logic val keywords = Sessions.base_info(options, logic).check.base.overall_syntax.keywords - val output_path = extension_dir + Path.explode(Grammar.default_output(logic)) + val output_path = extension_dir + Path.explode(TextMate_Grammar.default_output(logic)) progress.echo(output_path.implode) - File.write_backup(output_path, Grammar.generate(keywords)) + File.write_backup(output_path, TextMate_Grammar.generate(keywords)) } diff -r 47ffeb3448f4 -r f6bf65554764 src/Tools/VSCode/src/grammar.scala --- a/src/Tools/VSCode/src/grammar.scala Sat Nov 28 23:30:25 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,167 +0,0 @@ -/* Title: Tools/VSCode/src/grammar.scala - Author: Makarius - -Generate static TextMate grammar for VSCode editor. -*/ - -package isabelle.vscode - - -import isabelle._ - - -object Grammar -{ - /* generate grammar */ - - lazy val default_logic = Isabelle_System.getenv("ISABELLE_LOGIC") - - def default_output(logic: String = ""): String = - if (logic == "" || logic == default_logic) "isabelle-grammar.json" - else "isabelle-" + logic + "-grammar.json" - - def generate(keywords: Keyword.Keywords): JSON.S = - { - val (minor_keywords, operators) = - keywords.minor.iterator.toList.partition(Symbol.is_ascii_identifier) - - def major_keywords(pred: String => Boolean): List[String] = - (for { - k <- keywords.major.iterator - kind <- keywords.kinds.get(k) - if pred(kind) - } yield k).toList - - val keywords1 = - major_keywords(k => k != Keyword.THY_END && k != Keyword.PRF_ASM && k != Keyword.PRF_ASM_GOAL) - val keywords2 = minor_keywords ::: major_keywords(Set(Keyword.THY_END)) - val keywords3 = major_keywords(Set(Keyword.PRF_ASM, Keyword.PRF_ASM_GOAL)) - - - def grouped_names(as: List[String]): String = - JSON.Format("\\b(" + as.sorted.map(Library.escape_regex).mkString("|") + ")\\b") - - """{ - "name": "Isabelle", - "scopeName": "source.isabelle", - "fileTypes": ["thy"], - "uuid": """ + JSON.Format(UUID.random_string()) + """, - "repository": { - "comment": { - "patterns": [ - { - "name": "comment.block.isabelle", - "begin": "\\(\\*", - "patterns": [{ "include": "#comment" }], - "end": "\\*\\)" - } - ] - }, - "cartouche": { - "patterns": [ - { - "name": "string.quoted.other.multiline.isabelle", - "begin": "(?:\\\\|‹)", - "patterns": [{ "include": "#cartouche" }], - "end": "(?:\\\\|›)" - } - ] - } - }, - "patterns": [ - { - "include": "#comment" - }, - { - "include": "#cartouche" - }, - { - "name": "keyword.control.isabelle", - "match": """ + grouped_names(keywords1) + """ - }, - { - "name": "keyword.other.unit.isabelle", - "match": """ + grouped_names(keywords2) + """ - }, - { - "name": "keyword.operator.isabelle", - "match": """ + grouped_names(operators) + """ - }, - { - "name": "entity.name.type.isabelle", - "match": """ + grouped_names(keywords3) + """ - }, - { - "name": "constant.numeric.isabelle", - "match": "\\b\\d*\\.?\\d+\\b" - }, - { - "name": "string.quoted.double.isabelle", - "begin": "\"", - "patterns": [ - { - "name": "constant.character.escape.isabelle", - "match": """ + JSON.Format("""\\[\"]|\\\d\d\d""") + """ - } - ], - "end": "\"" - }, - { - "name": "string.quoted.backtick.isabelle", - "begin": "`", - "patterns": [ - { - "name": "constant.character.escape.isabelle", - "match": """ + JSON.Format("""\\[\`]|\\\d\d\d""") + """ - } - ], - "end": "`" - }, - { - "name": "string.quoted.verbatim.isabelle", - "begin": """ + JSON.Format("""\{\*""") + """, - "patterns": [ - { "match": """ + JSON.Format("""[^*]+|\*(?!\})""") + """ } - ], - "end": """ + JSON.Format("""\*\}""") + """ - } - ] -} -""" - } - - - /* Isabelle tool wrapper */ - - val isabelle_tool = Isabelle_Tool("vscode_grammar", - "generate static TextMate grammar for VSCode editor", Scala_Project.here, args => - { - var dirs: List[Path] = Nil - var logic = default_logic - var output: Option[Path] = None - - val getopts = Getopts(""" -Usage: isabelle vscode_grammar [OPTIONS] - - Options are: - -d DIR include session directory - -l NAME logic session name (default ISABELLE_LOGIC=""" + quote(default_logic) + """) - -o FILE output file name (default """ + default_output() + """) - - Generate static TextMate grammar for VSCode editor. -""", - "d:" -> (arg => dirs = dirs ::: List(Path.explode(arg))), - "l:" -> (arg => logic = arg), - "o:" -> (arg => output = Some(Path.explode(arg)))) - - val more_args = getopts(args) - if (more_args.nonEmpty) getopts.usage() - - val keywords = - Sessions.base_info(Options.init(), logic, dirs = dirs).check.base.overall_syntax.keywords - val output_path = output getOrElse Path.explode(default_output(logic)) - - Output.writeln(output_path.implode) - File.write_backup(output_path, generate(keywords)) - }) -} diff -r 47ffeb3448f4 -r f6bf65554764 src/Tools/VSCode/src/textmate_grammar.scala --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/Tools/VSCode/src/textmate_grammar.scala Sat Nov 28 23:36:17 2020 +0100 @@ -0,0 +1,167 @@ +/* Title: Tools/VSCode/src/textmate_grammar.scala + Author: Makarius + +Generate static TextMate grammar for VSCode editor. +*/ + +package isabelle.vscode + + +import isabelle._ + + +object TextMate_Grammar +{ + /* generate grammar */ + + lazy val default_logic = Isabelle_System.getenv("ISABELLE_LOGIC") + + def default_output(logic: String = ""): String = + if (logic == "" || logic == default_logic) "isabelle-grammar.json" + else "isabelle-" + logic + "-grammar.json" + + def generate(keywords: Keyword.Keywords): JSON.S = + { + val (minor_keywords, operators) = + keywords.minor.iterator.toList.partition(Symbol.is_ascii_identifier) + + def major_keywords(pred: String => Boolean): List[String] = + (for { + k <- keywords.major.iterator + kind <- keywords.kinds.get(k) + if pred(kind) + } yield k).toList + + val keywords1 = + major_keywords(k => k != Keyword.THY_END && k != Keyword.PRF_ASM && k != Keyword.PRF_ASM_GOAL) + val keywords2 = minor_keywords ::: major_keywords(Set(Keyword.THY_END)) + val keywords3 = major_keywords(Set(Keyword.PRF_ASM, Keyword.PRF_ASM_GOAL)) + + + def grouped_names(as: List[String]): String = + JSON.Format("\\b(" + as.sorted.map(Library.escape_regex).mkString("|") + ")\\b") + + """{ + "name": "Isabelle", + "scopeName": "source.isabelle", + "fileTypes": ["thy"], + "uuid": """ + JSON.Format(UUID.random_string()) + """, + "repository": { + "comment": { + "patterns": [ + { + "name": "comment.block.isabelle", + "begin": "\\(\\*", + "patterns": [{ "include": "#comment" }], + "end": "\\*\\)" + } + ] + }, + "cartouche": { + "patterns": [ + { + "name": "string.quoted.other.multiline.isabelle", + "begin": "(?:\\\\|‹)", + "patterns": [{ "include": "#cartouche" }], + "end": "(?:\\\\|›)" + } + ] + } + }, + "patterns": [ + { + "include": "#comment" + }, + { + "include": "#cartouche" + }, + { + "name": "keyword.control.isabelle", + "match": """ + grouped_names(keywords1) + """ + }, + { + "name": "keyword.other.unit.isabelle", + "match": """ + grouped_names(keywords2) + """ + }, + { + "name": "keyword.operator.isabelle", + "match": """ + grouped_names(operators) + """ + }, + { + "name": "entity.name.type.isabelle", + "match": """ + grouped_names(keywords3) + """ + }, + { + "name": "constant.numeric.isabelle", + "match": "\\b\\d*\\.?\\d+\\b" + }, + { + "name": "string.quoted.double.isabelle", + "begin": "\"", + "patterns": [ + { + "name": "constant.character.escape.isabelle", + "match": """ + JSON.Format("""\\[\"]|\\\d\d\d""") + """ + } + ], + "end": "\"" + }, + { + "name": "string.quoted.backtick.isabelle", + "begin": "`", + "patterns": [ + { + "name": "constant.character.escape.isabelle", + "match": """ + JSON.Format("""\\[\`]|\\\d\d\d""") + """ + } + ], + "end": "`" + }, + { + "name": "string.quoted.verbatim.isabelle", + "begin": """ + JSON.Format("""\{\*""") + """, + "patterns": [ + { "match": """ + JSON.Format("""[^*]+|\*(?!\})""") + """ } + ], + "end": """ + JSON.Format("""\*\}""") + """ + } + ] +} +""" + } + + + /* Isabelle tool wrapper */ + + val isabelle_tool = Isabelle_Tool("vscode_grammar", + "generate static TextMate grammar for VSCode editor", Scala_Project.here, args => + { + var dirs: List[Path] = Nil + var logic = default_logic + var output: Option[Path] = None + + val getopts = Getopts(""" +Usage: isabelle vscode_grammar [OPTIONS] + + Options are: + -d DIR include session directory + -l NAME logic session name (default ISABELLE_LOGIC=""" + quote(default_logic) + """) + -o FILE output file name (default """ + default_output() + """) + + Generate static TextMate grammar for VSCode editor. +""", + "d:" -> (arg => dirs = dirs ::: List(Path.explode(arg))), + "l:" -> (arg => logic = arg), + "o:" -> (arg => output = Some(Path.explode(arg)))) + + val more_args = getopts(args) + if (more_args.nonEmpty) getopts.usage() + + val keywords = + Sessions.base_info(Options.init(), logic, dirs = dirs).check.base.overall_syntax.keywords + val output_path = output getOrElse Path.explode(default_output(logic)) + + Output.writeln(output_path.implode) + File.write_backup(output_path, generate(keywords)) + }) +}