Skip to content

Commit 9e61a2f

Browse files
committed
Merge branch 'master' into multiLineArrowParameters
2 parents fb1064a + e8fea97 commit 9e61a2f

Some content is hidden

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

51 files changed

+6518
-714
lines changed

.gitignore

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
build/node_modules
2-
build/typings/
1+
node_modules
32
build/*.js
4-
tests/generated/*
5-
tests/node_modules
6-
tests/typings/
7-
tests/*.js
3+
tests/*.js
4+
tests/generated/*

.travis.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
language: node_js
2+
3+
node_js:
4+
- 'stable'
5+
- '8'
6+
7+
sudo: false
8+
9+
env:
10+
- workerCount=2
11+
12+
matrix:
13+
fast_finish: true
14+
15+
branches:
16+
only:
17+
- master
18+
19+
install:
20+
- npm install
21+
22+
cache:
23+
directories:
24+
- node_modules
25+
26+
git:
27+
depth: 1

README.md

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# TypeScript-TmLanguage
2-
[![Build status](https://ci.appveyor.com/api/projects/status/i7fp97q9nc5uw5kf?svg=true)](https://ci.appveyor.com/project/zhengbli/typescript-tmlanguage)
2+
[![Build status](https://travis-ci.org/Microsoft/TypeScript-TmLanguage.svg?branch=master)](https://travis-ci.org/Microsoft/TypeScript-TmLanguage)
33

44
This repository contains TmLanguage files that are consumed by TypeScript editors and plugins such as [Visual Studio Code](https://github.com/Microsoft/vscode), [The TypeScript Sublime Plugin](https://github.com/Microsoft/TypeScript-Sublime-Plugin), [Atom TypeScript](https://github.com/TypeStrong/atom-typescript), and possibly others.
55

@@ -9,28 +9,24 @@ Latest version of the grammar can be also found as a [VSCode extension](https://
99

1010
The XML files are generated from the YAML files, so contributors should hand-modify the YAML files, and XML files should only be generated by running build script.
1111

12+
## Install dependencies
13+
``` sh
14+
npm install
15+
```
16+
1217
## Build
1318

14-
Update the XML files from within the ```build``` folder
19+
Compile the yaml file into the tmLanguage and tmTheme files
1520

1621
``` sh
17-
cd build
18-
npm install # Installs dependencies required for building
19-
npm start # Compiles & builds the XML files
22+
npm run build:grammar
2023
```
2124

2225
## Tests
2326

24-
Test are run from within the ```tests``` folder and depend on build to make sure XML files are upto date
25-
2627
``` sh
27-
cd build
28-
npm install # Installs dependencies required for building
29-
30-
cd ../tests
31-
npm install # Installs dependencies required for testing
3228
npm test # Compiles & runs tests
3329

3430
npm run diff # Diffs the test baselines with generated one using tool set in environment variable DIFF
3531
npm run accept # Accepts the test baselines
36-
```
32+
```

0 commit comments

Comments
 (0)