提交 b09e1df1 编写于 作者: M Martin Aeschlimann

[fsharp] Updated fsharp.json to ionide/ionide-fsgrammar@864bfd9 (2016-12-21). Fixes #17820

上级 bd6b32b4
......@@ -19,7 +19,7 @@ This project incorporates components from the projects listed below. The origina
12. freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
13. HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
14. Ionic documentation version 1.2.4 (https://github.com/driftyco/ionic-site)
15. ionide/ionide-fsharp (https://github.com/ionide/ionide-atom-fsharp)
15. ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
16. js-beautify version 1.6.4 (https://github.com/beautify-web/js-beautify)
17. Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
18. language-docker (https://github.com/docker/docker)
......@@ -500,7 +500,7 @@ END OF ionide/ionide-fsharp NOTICES AND INFORMATION
=========================================
The MIT License (MIT)
Copyright (c) 2007-2013 Einar Lielmanis and contributors.
Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors.
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
......
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "ionide/ionide-fsharp",
"name": "ionide/ionide-fsgrammar",
"version": "0.0.0",
"license": "MIT",
"repositoryURL": "https://github.com/ionide/ionide-atom-fsharp",
"description": "The file syntaxes/fsharp.json was included from https://github.com/ionide/ionide-atom-fsharp/blob/develop/release/grammars/fsharp.json."
"repositoryURL": "https://github.com/ionide/ionide-fsgrammar",
"description": "The file syntaxes/fsharp.json was included from https://github.com/ionide/ionide-fsgrammar/blob/master/grammar/fsharp.json."
}]
......@@ -3,6 +3,9 @@
"version": "0.1.0",
"publisher": "vscode",
"engines": { "vscode": "*" },
"scripts": {
"update-grammar": "node ../../build/npm/update-grammar.js ionide/ionide-fsgrammar grammar/fsharp.json ./syntaxes/fsharp.json"
},
"contributes": {
"languages": [{
"id": "fsharp",
......
......@@ -22,19 +22,8 @@
}
},
{
"c": "type Person(name",
"t": "",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": ":",
"t": "fsharp.keyword.other",
"c": "type",
"t": "fsharp.keyword.other.record",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -44,8 +33,8 @@
}
},
{
"c": "string, age",
"t": "",
"c": " ",
"t": "fsharp.record",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -55,19 +44,19 @@
}
},
{
"c": ":",
"t": "fsharp.keyword.other",
"c": "Person(name:string, age:int)",
"t": "entity.fsharp.name.record.type",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.keyword rgb(86, 156, 214)",
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.keyword rgb(0, 0, 255)",
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.keyword rgb(86, 156, 214)"
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.type rgb(78, 201, 176)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.type rgb(38, 127, 153)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "int) ",
"t": "",
"c": " ",
"t": "fsharp.record",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -78,7 +67,7 @@
},
{
"c": "=",
"t": "fsharp.keyword.other",
"t": "fsharp.keyword.other.record",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -100,7 +89,7 @@
},
{
"c": "let mutable",
"t": "binding.fsharp.keyword.meta.other",
"t": "binding.fsharp.keyword.other",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -111,7 +100,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -122,7 +111,7 @@
},
{
"c": "internalAge",
"t": "binding.fsharp.meta.other.variable",
"t": "binding.fsharp.other.variable",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
......@@ -133,7 +122,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -144,7 +133,7 @@
},
{
"c": "=",
"t": "binding.fsharp.keyword.meta.other",
"t": "binding.fsharp.keyword.other",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -276,7 +265,7 @@
},
{
"c": "member",
"t": "binding.fsharp.keyword.meta.other",
"t": "binding.fsharp.keyword.other",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -287,7 +276,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -298,7 +287,7 @@
},
{
"c": "this.Name",
"t": "binding.fsharp.meta.other.variable",
"t": "binding.fsharp.other.variable",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
......@@ -309,7 +298,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -320,7 +309,7 @@
},
{
"c": "=",
"t": "binding.fsharp.keyword.meta.other",
"t": "binding.fsharp.keyword.other",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -375,7 +364,7 @@
},
{
"c": "member",
"t": "binding.fsharp.keyword.meta.other",
"t": "binding.fsharp.keyword.other",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -386,7 +375,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -397,7 +386,7 @@
},
{
"c": "this.Age",
"t": "binding.fsharp.meta.other.variable",
"t": "binding.fsharp.other.variable",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
......@@ -573,7 +562,7 @@
},
{
"c": "member",
"t": "binding.fsharp.keyword.meta.other",
"t": "binding.fsharp.keyword.other",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -584,7 +573,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -595,7 +584,7 @@
},
{
"c": "this.HasABirthday",
"t": "binding.fsharp.meta.other.variable",
"t": "binding.fsharp.other.variable",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
......@@ -606,7 +595,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -617,7 +606,7 @@
},
{
"c": "()",
"t": "binding.constant.fsharp.language.meta.unit",
"t": "binding.constant.fsharp.language.unit",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.constant.language rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.constant.language rgb(0, 0, 255)",
......@@ -628,7 +617,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -639,7 +628,7 @@
},
{
"c": "=",
"t": "binding.fsharp.keyword.meta.other",
"t": "binding.fsharp.keyword.other",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -727,7 +716,7 @@
},
{
"c": "member",
"t": "binding.fsharp.keyword.meta.other",
"t": "binding.fsharp.keyword.other",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -738,7 +727,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -749,7 +738,7 @@
},
{
"c": "this.IsOfAge",
"t": "binding.fsharp.meta.other.variable",
"t": "binding.fsharp.other.variable",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
......@@ -760,7 +749,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -771,7 +760,7 @@
},
{
"c": "targetAge",
"t": "binding.fsharp.meta.parameter.variable",
"t": "binding.fsharp.parameter.variable",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable.parameter rgb(156, 220, 254)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable.parameter rgb(0, 16, 128)",
......@@ -782,7 +771,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -793,7 +782,7 @@
},
{
"c": "=",
"t": "binding.fsharp.keyword.meta.other",
"t": "binding.fsharp.keyword.other",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -848,7 +837,7 @@
},
{
"c": "override",
"t": "binding.fsharp.keyword.meta.other",
"t": "binding.fsharp.keyword.other",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......@@ -859,7 +848,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -870,7 +859,7 @@
},
{
"c": "this.ToString",
"t": "binding.fsharp.meta.other.variable",
"t": "binding.fsharp.other.variable",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
......@@ -881,7 +870,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -892,7 +881,7 @@
},
{
"c": "()",
"t": "binding.constant.fsharp.language.meta.unit",
"t": "binding.constant.fsharp.language.unit",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.constant.language rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.constant.language rgb(0, 0, 255)",
......@@ -903,7 +892,7 @@
},
{
"c": " ",
"t": "binding.fsharp.meta",
"t": "binding.fsharp",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
......@@ -914,7 +903,7 @@
},
{
"c": "=",
"t": "binding.fsharp.keyword.meta.other",
"t": "binding.fsharp.keyword.other",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册