Skip to content

Commit

Permalink
fixes #7688, fixes #2936, fixes #2867, fixes #2208
Browse files Browse the repository at this point in the history
  • Loading branch information
Don Jayamanne committed Aug 21, 2016
1 parent 9961aa2 commit f496772
Show file tree
Hide file tree
Showing 8 changed files with 6,315 additions and 6,324 deletions.
29 changes: 8 additions & 21 deletions extensions/python/OSSREADME.json
@@ -1,22 +1,9 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "textmate/python.tmbundle",
"version": "0.0.0",
"license": "TextMate Bundle License",
"repositoryURL": "https://github.com/textmate/python.tmbundle",
"licenseDetail": [
"Copyright (c) textmate-python.tmbundle project authors",
"",
"If not otherwise specified (see below), files in this repository fall under the following license:",
"",
"Permission to copy, use, modify, sell and distribute this",
"software is granted. This software is provided \"as is\" without",
"express or implied warranty, and with no claim as to its",
"suitability for any purpose.",
"",
"An exception is made for files in readable text which contain their own license information,",
"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
"\"tidy\" is accompanied by \"tidy-license.txt\"."
]
}]
[
{
"name": "MagicStack/MagicPython",
"version": "0.0.0",
"license": "MIT",
"repositoryURL": "https://github.com/MagicStack/MagicPython"
}
]
7 changes: 4 additions & 3 deletions extensions/python/package.json
Expand Up @@ -16,14 +16,15 @@
"grammars": [{
"language": "python",
"scopeName": "source.python",
"path": "./syntaxes/Python.tmLanguage"
"path": "./syntaxes/MagicPython.tmLanguage.json"
},{
"scopeName": "source.regexp.python",
"path": "./syntaxes/Regular Expressions (Python).tmLanguage"
"path": "./syntaxes/MagicRegExp.tmLanguage.json"
}]
},
"scripts": {
"compile": "gulp compile-extension:python",
"watch": "gulp watch-extension:python"
"watch": "gulp watch-extension:python",
"update-grammar": "node ../../build/npm/update-grammar.js MagicStack/MagicPython grammars/MagicPython.tmLanguage ./syntaxes/MagicPython.tmLanguage.json grammars/MagicRegExp.tmLanguage ./syntaxes/MagicRegExp.tmLanguage.json"
}
}

0 comments on commit f496772

Please sign in to comment.