Skip to content

Commit f16135b

Browse files
mjbvzmjbvz
committed
Sw9tch Objective-C to Use the Atom Objective C Language
Switching to use the atom objective-c fork of the textmate grammar. The atom version seems to be more maitained
1 parent a801f73 commit f16135b

7 files changed

Lines changed: 1405 additions & 1591 deletions

File tree

‎ThirdPartyNotices.txt‎

Lines changed: 82 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,51 @@ This project incorporates components from the projects listed below. The origina
1111
2. atom/language-clojure (https://github.com/atom/language-clojure)
1212
3. atom/language-coffee-script (https://github.com/atom/language-coffee-script)
1313
4. atom/language-css (https://github.com/atom/language-css)
14-
5. atom/language-sass version 0.52.0 (https://github.com/atom/language-sass)
15-
6. atom/language-xml (https://github.com/atom/language-xml)
16-
7. Benvie/JavaScriptNext.tmLanguage (https://github.com/Benvie/JavaScriptNext.tmLanguage)
17-
8. chjj-marked version 0.3.2 (https://github.com/npmcomponent/chjj-marked)
18-
9. chriskempson/tomorrow-theme (https://github.com/chriskempson/tomorrow-theme)
19-
10. Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
20-
11. daaain/Handlebars (https://github.com/daaain/Handlebars)
21-
12. davidrios/jade-tmbundle (https://github.com/davidrios/jade-tmbundle)
22-
13. definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
23-
14. demyte/language-cshtml (https://github.com/demyte/language-cshtml)
24-
15. dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
25-
16. freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
26-
17. HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
27-
18. Ionic documentation version 1.2.4 (https://github.com/driftyco/ionic-site)
28-
19. ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
29-
20. js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
30-
21. Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
31-
22. language-docker (https://github.com/docker/docker)
32-
23. language-go version 0.39.0 (https://github.com/atom/language-go)
33-
24. language-less (https://github.com/atom/language-less)
34-
25. language-php (https://github.com/atom/language-php)
35-
26. language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
36-
27. MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
37-
28. Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
38-
29. octicons-code version 3.1.0 (https://octicons.github.com)
39-
30. octicons-font version 3.1.0 (https://octicons.github.com)
40-
31. seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
41-
32. shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
42-
33. string_scorer version 0.1.20 (https://github.com/joshaven/string_score)
43-
34. sublimehq/Packages (https://github.com/sublimehq/Packages)
44-
35. SublimeText/PowerShell (https://github.com/SublimeText/PowerShell)
45-
36. textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
46-
37. textmate/c.tmbundle (https://github.com/textmate/c.tmbundle)
47-
38. textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle)
48-
39. textmate/git.tmbundle (https://github.com/textmate/git.tmbundle)
49-
40. textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle)
50-
41. textmate/html.tmbundle (https://github.com/textmate/html.tmbundle)
51-
42. textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle)
52-
43. textmate/java.tmbundle (https://github.com/textmate/java.tmbundle)
53-
44. textmate/javadoc.tmbundle (https://github.com/textmate/javadoc.tmbundle)
54-
45. textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle)
55-
46. textmate/lua.tmbundle (https://github.com/textmate/lua.tmbundle)
56-
47. textmate/make.tmbundle (https://github.com/textmate/make.tmbundle)
57-
48. textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle)
58-
49. textmate/objective-c.tmbundle (https://github.com/textmate/objective-c.tmbundle)
14+
5. atom/language-objective-c (https://github.com/atom/language-objective-c)
15+
6. atom/language-sass version 0.52.0 (https://github.com/atom/language-sass)
16+
7. atom/language-xml (https://github.com/atom/language-xml)
17+
8. Benvie/JavaScriptNext.tmLanguage (https://github.com/Benvie/JavaScriptNext.tmLanguage)
18+
9. chjj-marked version 0.3.2 (https://github.com/npmcomponent/chjj-marked)
19+
10. chriskempson/tomorrow-theme (https://github.com/chriskempson/tomorrow-theme)
20+
11. Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
21+
12. daaain/Handlebars (https://github.com/daaain/Handlebars)
22+
13. davidrios/jade-tmbundle (https://github.com/davidrios/jade-tmbundle)
23+
14. definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
24+
15. demyte/language-cshtml (https://github.com/demyte/language-cshtml)
25+
16. dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
26+
17. freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
27+
18. HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
28+
19. Ionic documentation version 1.2.4 (https://github.com/driftyco/ionic-site)
29+
20. ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
30+
21. js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
31+
22. Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
32+
23. language-docker (https://github.com/docker/docker)
33+
24. language-go version 0.39.0 (https://github.com/atom/language-go)
34+
25. language-less (https://github.com/atom/language-less)
35+
26. language-php (https://github.com/atom/language-php)
36+
27. language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
37+
28. MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
38+
29. Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
39+
30. octicons-code version 3.1.0 (https://octicons.github.com)
40+
31. octicons-font version 3.1.0 (https://octicons.github.com)
41+
32. seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
42+
33. shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
43+
34. string_scorer version 0.1.20 (https://github.com/joshaven/string_score)
44+
35. sublimehq/Packages (https://github.com/sublimehq/Packages)
45+
36. SublimeText/PowerShell (https://github.com/SublimeText/PowerShell)
46+
37. textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
47+
38. textmate/c.tmbundle (https://github.com/textmate/c.tmbundle)
48+
39. textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle)
49+
40. textmate/git.tmbundle (https://github.com/textmate/git.tmbundle)
50+
41. textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle)
51+
42. textmate/html.tmbundle (https://github.com/textmate/html.tmbundle)
52+
43. textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle)
53+
44. textmate/java.tmbundle (https://github.com/textmate/java.tmbundle)
54+
45. textmate/javadoc.tmbundle (https://github.com/textmate/javadoc.tmbundle)
55+
46. textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle)
56+
47. textmate/lua.tmbundle (https://github.com/textmate/lua.tmbundle)
57+
48. textmate/make.tmbundle (https://github.com/textmate/make.tmbundle)
58+
49. textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle)
5959
50. textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle)
6060
51. textmate/r.tmbundle (https://github.com/textmate/r.tmbundle)
6161
52. textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
@@ -248,6 +248,43 @@ suitability for any purpose.
248248
=========================================
249249
END OF atom/language-css NOTICES AND INFORMATION
250250

251+
%% atom/language-objective-c NOTICES AND INFORMATION BEGIN HERE
252+
=========================================
253+
The MIT License (MIT)
254+
255+
Copyright (c) 2014 GitHub Inc.
256+
257+
Permission is hereby granted, free of charge, to any person obtaining
258+
a copy of this software and associated documentation files (the
259+
"Software"), to deal in the Software without restriction, including
260+
without limitation the rights to use, copy, modify, merge, publish,
261+
distribute, sublicense, and/or sell copies of the Software, and to
262+
permit persons to whom the Software is furnished to do so, subject to
263+
the following conditions:
264+
265+
The above copyright notice and this permission notice shall be
266+
included in all copies or substantial portions of the Software.
267+
268+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
269+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
270+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
271+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
272+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
273+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
274+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
275+
276+
277+
This package was derived from a TextMate bundle located at
278+
https://github.com/textmate/objective-c.tmbundle and distributed under the following
279+
license, located in `README.mdown`:
280+
281+
Permission to copy, use, modify, sell and distribute this
282+
software is granted. This software is provided "as is" without
283+
express or implied warranty, and with no claim as to its
284+
suitability for any purpose.
285+
=========================================
286+
END OF atom/language-objective-c NOTICES AND INFORMATION
287+
251288
%% atom/language-sass NOTICES AND INFORMATION BEGIN HERE
252289
=========================================
253290
The MIT License (MIT)
@@ -1774,24 +1811,6 @@ to the base-name name of the original file, and an extension of txt, html, or si
17741811
=========================================
17751812
END OF textmate/markdown.tmbundle NOTICES AND INFORMATION
17761813

1777-
%% textmate/objective-c.tmbundle NOTICES AND INFORMATION BEGIN HERE
1778-
=========================================
1779-
Copyright (c) textmate-objective-c.tmbundle project authors
1780-
1781-
If not otherwise specified (see below), files in this repository fall under the following license:
1782-
1783-
Permission to copy, use, modify, sell and distribute this
1784-
software is granted. This software is provided "as is" without
1785-
express or implied warranty, and with no claim as to its
1786-
suitability for any purpose.
1787-
1788-
An exception is made for files in readable text which contain their own license information,
1789-
or files where an accompanying file exists (in the same directory) with a "-license" suffix added
1790-
to the base-name name of the original file, and an extension of txt, html, or similar. For example
1791-
"tidy" is accompanied by "tidy-license.txt".
1792-
=========================================
1793-
END OF textmate/objective-c.tmbundle NOTICES AND INFORMATION
1794-
17951814
%% textmate/perl.tmbundle NOTICES AND INFORMATION BEGIN HERE
17961815
=========================================
17971816
Copyright (c) textmate-perl.tmbundle project authors

‎extensions/objective-c/OSSREADME.json‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
11
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
22
[{
3-
"name": "textmate/objective-c.tmbundle",
3+
"name": "atom/language-objective-c",
44
"version": "0.0.0",
5-
"license": "TextMate Bundle License",
6-
"repositoryURL": "https://github.com/textmate/objective-c.tmbundle",
7-
"licenseDetail": [
8-
"Copyright (c) textmate-objective-c.tmbundle project authors",
9-
"",
10-
"If not otherwise specified (see below), files in this repository fall under the following license:",
11-
"",
12-
"Permission to copy, use, modify, sell and distribute this",
13-
"software is granted. This software is provided \"as is\" without",
14-
"express or implied warranty, and with no claim as to its",
15-
"suitability for any purpose.",
16-
"",
17-
"An exception is made for files in readable text which contain their own license information,",
18-
"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
19-
"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
20-
"\"tidy\" is accompanied by \"tidy-license.txt\"."
21-
]
5+
"license": "MIT",
6+
"repositoryURL": "https://github.com/atom/language-objective-c",
7+
"description": "The files syntaxes/objective-c.tmLanguage.json and syntaxes/objective-c++.tmLanguage.json were derived from the Atom package https://github.com/atom/language-objective-c which was originally converted from the TextMate bundle https://github.com/textmate/objective-c.tmbundle."
228
}]

‎extensions/objective-c/package.json‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,46 @@
22
"name": "objective-c",
33
"version": "0.1.0",
44
"publisher": "vscode",
5-
"engines": { "vscode": "*" },
5+
"engines": {
6+
"vscode": "*"
7+
},
8+
"scripts": {
9+
"update-grammar": "node ../../build/npm/update-grammar.js atom/language-objective-c grammars/objective-c.cson ./syntaxes/objective-c.tmLanguage.json && node ../../build/npm/update-grammar.js atom/language-objective-c grammars/objective-c++.cson ./syntaxes/objective-c++.tmLanguage.json"
10+
},
611
"contributes": {
7-
"languages": [{
8-
"id": "objective-c",
9-
"extensions": [ ".m" ],
10-
"aliases": [ "Objective-C"],
11-
"configuration": "./language-configuration.json"
12-
}],
13-
"grammars": [{
14-
"language": "objective-c",
15-
"scopeName": "source.objc",
16-
"path": "./syntaxes/Objective-C.tmLanguage"
17-
}]
12+
"languages": [
13+
{
14+
"id": "objective-c",
15+
"extensions": [
16+
".m"
17+
],
18+
"aliases": [
19+
"Objective-C"
20+
],
21+
"configuration": "./language-configuration.json"
22+
},
23+
{
24+
"id": "objective-c++",
25+
"extensions": [
26+
".mm"
27+
],
28+
"aliases": [
29+
"Objective-C++"
30+
],
31+
"configuration": "./language-configuration.json"
32+
}
33+
],
34+
"grammars": [
35+
{
36+
"language": "objective-c",
37+
"scopeName": "source.objc",
38+
"path": "./syntaxes/objective-c.tmLanguage.json"
39+
},
40+
{
41+
"language": "objective-c++",
42+
"scopeName": "source.objcpp",
43+
"path": "./syntaxes/objective-c++.tmLanguage.json"
44+
}
45+
]
1846
}
1947
}

0 commit comments

Comments
 (0)