Skip to content

Commit 3767bd1

Browse files
alexdimaalexdima
committed
Merge branch 'master' into alex/tokenization
# Conflicts: # src/vs/editor/contrib/suggest/common/snippetCompletion.ts # src/vs/editor/node/textMate/TMSyntax.ts
2 parents 8905cb1 + ab491d3 commit 3767bd1

222 files changed

Lines changed: 3566 additions & 2972 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ThirdPartyNotices.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This project incorporates components from the projects listed below. The origina
1919
12. freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
2020
13. HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
2121
14. Ionic documentation version 1.2.4 (https://github.com/driftyco/ionic-site)
22-
15. ionide/ionide-fsharp (https://github.com/ionide/ionide-atom-fsharp)
22+
15. ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
2323
16. js-beautify version 1.6.4 (https://github.com/beautify-web/js-beautify)
2424
17. Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
2525
18. language-docker (https://github.com/docker/docker)
@@ -500,7 +500,7 @@ END OF ionide/ionide-fsharp NOTICES AND INFORMATION
500500
=========================================
501501
The MIT License (MIT)
502502

503-
Copyright (c) 2007-2013 Einar Lielmanis and contributors.
503+
Copyright (c) 2007-2017 Einar Lielmanis, Liam Newman, and contributors.
504504

505505
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:
506506

‎build/gulpfile.vscode.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,17 @@ gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compil
9191
out: 'out-vscode'
9292
}));
9393

94+
95+
gulp.task('optimize-index-js', ['optimize-vscode'], () => {
96+
const fullpath = path.join(process.cwd(), 'out-vscode/vs/workbench/electron-browser/bootstrap/index.js')
97+
const contents = fs.readFileSync(fullpath).toString();
98+
const newContents = contents.replace('[/*BUILD->INSERT_NODE_MODULES*/]', JSON.stringify(nodeModules));
99+
fs.writeFileSync(fullpath, newContents);
100+
})
101+
94102
const baseUrl = `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`;
95103
gulp.task('clean-minified-vscode', util.rimraf('out-vscode-min'));
96-
gulp.task('minify-vscode', ['clean-minified-vscode', 'optimize-vscode'], common.minifyTask('out-vscode', baseUrl));
104+
gulp.task('minify-vscode', ['clean-minified-vscode', 'optimize-index-js'], common.minifyTask('out-vscode', baseUrl));
97105

98106
// Package
99107
const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));

‎extensions/fsharp/OSSREADME.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
22
[{
3-
"name": "ionide/ionide-fsharp",
3+
"name": "ionide/ionide-fsgrammar",
44
"version": "0.0.0",
55
"license": "MIT",
6-
"repositoryURL": "https://github.com/ionide/ionide-atom-fsharp",
7-
"description": "The file syntaxes/fsharp.json was included from https://github.com/ionide/ionide-atom-fsharp/blob/develop/release/grammars/fsharp.json."
6+
"repositoryURL": "https://github.com/ionide/ionide-fsgrammar",
7+
"description": "The file syntaxes/fsharp.json was included from https://github.com/ionide/ionide-fsgrammar/blob/master/grammar/fsharp.json."
88
}]

‎extensions/fsharp/package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
"version": "0.1.0",
44
"publisher": "vscode",
55
"engines": { "vscode": "*" },
6+
"scripts": {
7+
"update-grammar": "node ../../build/npm/update-grammar.js ionide/ionide-fsgrammar grammar/fsharp.json ./syntaxes/fsharp.json"
8+
},
69
"contributes": {
710
"languages": [{
811
"id": "fsharp",

0 commit comments

Comments
 (0)