Skip to content

Commit

Permalink
[fsharp] Updated fsharp.json to ionide/ionide-fsgrammar@864bfd9 (2016…
Browse files Browse the repository at this point in the history
…-12-21). Fixes #17820
  • Loading branch information
aeschli committed Dec 29, 2016
1 parent bd6b32b commit b09e1df
Show file tree
Hide file tree
Showing 5 changed files with 591 additions and 595 deletions.
4 changes: 2 additions & 2 deletions ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:

Expand Down
6 changes: 3 additions & 3 deletions extensions/fsharp/OSSREADME.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// 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 changes: 3 additions & 0 deletions extensions/fsharp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

0 comments on commit b09e1df

Please sign in to comment.