Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: borela/naomi
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.0.7
Choose a base ref
...
head repository: borela/naomi
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 696 changed files with 16,199 additions and 7,773 deletions.
254 changes: 254 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,254 @@
{
"projectName": "naomi",
"projectOwner": "borela",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"contributors": [
{
"login": "borela",
"name": "Alexandre Borela",
"avatar_url": "https://avatars3.githubusercontent.com/u/11317458?v=4",
"profile": "https://github.com/borela",
"contributions": [
"bug",
"code",
"design",
"doc"
]
},
{
"login": "Whoaa512",
"name": "C.J. Winslow",
"avatar_url": "https://avatars0.githubusercontent.com/u/1581943?v=4",
"profile": "http://cjwinslow.com",
"contributions": [
"bug",
"code",
"ideas"
]
},
{
"login": "faiwer",
"name": "faiwer",
"avatar_url": "https://avatars1.githubusercontent.com/u/744114?v=4",
"profile": "https://faiwer.ru",
"contributions": [
"bug",
"ideas"
]
},
{
"login": "franciscolourenco",
"name": "Francisco Lourenço",
"avatar_url": "https://avatars0.githubusercontent.com/u/208149?v=4",
"profile": "https://www.betafabric.com/francisco/",
"contributions": [
"bug",
"code"
]
},
{
"login": "TomasBarry",
"name": "Tomas Barry",
"avatar_url": "https://avatars0.githubusercontent.com/u/9534622?v=4",
"profile": "https://butternutbox.com/",
"contributions": [
"code"
]
},
{
"login": "crapthings",
"name": "crapthings",
"avatar_url": "https://avatars2.githubusercontent.com/u/1147704?v=4",
"profile": "https://github.com/crapthings",
"contributions": [
"bug"
]
},
{
"login": "max-mykhailenko",
"name": "Max Mykhailenko",
"avatar_url": "https://avatars3.githubusercontent.com/u/1213198?v=4",
"profile": "http://memcrab.com",
"contributions": [
"bug"
]
},
{
"login": "2Pacalypse-",
"name": "Marko Žarković",
"avatar_url": "https://avatars3.githubusercontent.com/u/4757944?v=4",
"profile": "https://github.com/2Pacalypse-",
"contributions": [
"bug",
"ideas"
]
},
{
"login": "neaumusic",
"name": "James Wilson",
"avatar_url": "https://avatars0.githubusercontent.com/u/3423750?v=4",
"profile": "http://neaumusic.github.io",
"contributions": [
"bug"
]
},
{
"login": "ericbiewener",
"name": "ericbiewener",
"avatar_url": "https://avatars2.githubusercontent.com/u/253298?v=4",
"profile": "https://github.com/ericbiewener",
"contributions": [
"bug"
]
},
{
"login": "lematt1991",
"name": "Matt Le",
"avatar_url": "https://avatars1.githubusercontent.com/u/13142923?v=4",
"profile": "https://lematt1991.github.io/",
"contributions": [
"bug"
]
},
{
"login": "clark-pan",
"name": "Clark Pan",
"avatar_url": "https://avatars0.githubusercontent.com/u/1161431?v=4",
"profile": "https://github.com/clark-pan",
"contributions": [
"bug",
"ideas"
]
},
{
"login": "octet-stream",
"name": "Nick K.",
"avatar_url": "https://avatars3.githubusercontent.com/u/7884558?v=4",
"profile": "https://octetstream.me",
"contributions": [
"bug"
]
},
{
"login": "AlexKvazos",
"name": "Alex Cavazos",
"avatar_url": "https://avatars3.githubusercontent.com/u/4448627?v=4",
"profile": "https://eventa.mx",
"contributions": [
"bug"
]
},
{
"login": "eballeste",
"name": "Enrique Ballesté",
"avatar_url": "https://avatars3.githubusercontent.com/u/6924108?v=4",
"profile": "https://divisionof.com",
"contributions": [
"bug",
"ideas"
]
},
{
"login": "davidcalhoun",
"name": "David Calhoun",
"avatar_url": "https://avatars0.githubusercontent.com/u/120596?v=4",
"profile": "http://themaingate.net",
"contributions": [
"bug",
"ideas"
]
},
{
"login": "StreetStrider",
"name": "Strider",
"avatar_url": "https://avatars3.githubusercontent.com/u/2124761?v=4",
"profile": "https://github.com/StreetStrider",
"contributions": [
"bug",
"ideas",
"code"
]
},
{
"login": "MauricioAndrades",
"name": "Mauricio Andrades",
"avatar_url": "https://avatars0.githubusercontent.com/u/4704508?v=4",
"profile": "http://mauricioandrades.com/",
"contributions": [
"bug"
]
},
{
"login": "gerardroche",
"name": "Gerard Roche",
"avatar_url": "https://avatars3.githubusercontent.com/u/44148?v=4",
"profile": "http://blog.gerardroche.com",
"contributions": [
"code"
]
},
{
"login": "ihodev",
"name": "Ihor Oleksandrov",
"avatar_url": "https://avatars1.githubusercontent.com/u/9801624?v=4",
"profile": "https://github.com/ihodev",
"contributions": [
"code",
"design"
]
},
{
"login": "seanders",
"name": "Sean Miller",
"avatar_url": "https://avatars0.githubusercontent.com/u/2849183?v=4",
"profile": "https://github.com/seanders",
"contributions": [
"bug"
]
},
{
"login": "YuriGor",
"name": "YuriGor",
"avatar_url": "https://avatars0.githubusercontent.com/u/6861317?v=4",
"profile": "http://yurigor.com/",
"contributions": [
"bug",
"ideas"
]
},
{
"login": "mvllow",
"name": "not",
"avatar_url": "https://avatars2.githubusercontent.com/u/1474821?v=4",
"profile": "http://mellow.sh",
"contributions": [
"code"
]
},
{
"login": "Sawtaytoes",
"name": "Kevin Ghadyani",
"avatar_url": "https://avatars1.githubusercontent.com/u/3948069?v=4",
"profile": "http://kevinghadyani.info",
"contributions": [
"code"
]
},
{
"login": "rkoval",
"name": "Ryan Koval",
"avatar_url": "https://avatars2.githubusercontent.com/u/1282943?v=4",
"profile": "https://ryankoval.com",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
}
64 changes: 64 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Licensed under the Apache License, Version 2.0 (the “License”); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an “AS IS” BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.

before_install:
- curl -OL https://raw.githubusercontent.com/SublimeText/UnitTesting/master/sbin/travis.sh
# https://docs.travis-ci.com/user/gui-and-headless-browsers
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
export DISPLAY=:99.0;
sh -e /etc/init.d/xvfb start;
fi

env:
global:
- PACKAGE="Naomi"
- SUBLIME_TEXT_VERSION="3"
# - UNITTESTING_TAG="master"

install:
# Upgrade python on OSX.
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update;
brew upgrade python;
fi
# Install flake8 and coveralls.
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
pip install flake8;
pip install python-coveralls;
elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
pip3 install flake8;
pip3 install python-coveralls;
fi
# Bootstrap the testing environment.
- sh travis.sh bootstrap
# Install Package Control and dependencies.
- sh travis.sh install_package_control

matrix:
include:
- os: linux
language: python
python: 3.3
# https://docs.travis-ci.com/user/multi-os/#Python-example-(unsupported-languages)
- os: osx
language: generic

notifications:
email: false

script:
# Run python tests.
- sh travis.sh run_tests --coverage
# Run syntax tests.
- sh travis.sh run_syntax_tests
# Lint the plugin.
- flake8
24 changes: 17 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -21,8 +21,7 @@ to this document in a pull request.
1. Fork.
2. Follow the style guides.
3. Do your changes on a separate branch.
4. Use your real name and email in the commits.
5. Include screenshots and animated GIFs in your pull request whenever possible.
4. Include screenshots and animated GIFs in your pull request whenever possible.

## Style guides

@@ -74,8 +73,8 @@ those files you will need [CSScheme][CSScheme].
* Name the main syntax file using the following format
`naomi.[syntax].sublime-syntax`.
* Additional files must not have the `name` or `file_extension` keys in the
header. Also, they must have the key `scope` set to `...` and the key `hidden`
set to `true`.
header;
* Files must have the key `scope` set to `...` and the key `hidden` set to `true`.
* Break the syntax into multiple files to make it easier to maintain and extend.
* Break the regexes into multiple lines. This rule can be broken if the having
the patterns on the same line will make it clearer.
@@ -87,9 +86,6 @@ those files you will need [CSScheme][CSScheme].

### Tests style guide

* Feel free to use the `code-generator.xlsm` to generate tests for lists of
constants, it’s just a spreedsheet with macros where can click a button to
send the tests to the clipboard.
* Create multiple files to group related tests.
* Test as much as possible.
* Add the appropriate [license header](#license-headers).
@@ -145,6 +141,20 @@ that, so, if a file required careful design on your part, use one of these:
| the License.
-->

/**
* Licensed under the Apache License, Version 2.0 (the “License”); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an “AS IS” BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/

## Useful links

* [Sublime text API][sublimeApiDocs]
Loading