Skip to content

Commit

Permalink
Merge pull request #1 from k--kato/add/test
Browse files Browse the repository at this point in the history
add/test
  • Loading branch information
Keisuke KATO committed Jan 14, 2016
2 parents 20d0932 + 0cac343 commit d4592a9
Show file tree
Hide file tree
Showing 11 changed files with 473 additions and 34 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@ sudo: false
os:
- osx
- linux

before_install:
- if [ $TRAVIS_OS_NAME == "linux" ]; then
export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
sh -e /etc/init.d/xvfb start;
sleep 3;
fi

install:
- npm install mocha
- npm install
- npm run vscode:prepublish

script:
- npm test --silent
- npm run-script coverage
after_script: "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
1 change: 1 addition & 0 deletions .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ tsconfig.json
vsc-extension-quickstart.md
tslint.json
misc/**
.travis.yml
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# XML Documentation Comments Support for Visual Studio Code

[![Build Status](https://travis-ci.org/k--kato/docomment.svg?branch=master)](https://travis-ci.org/k--kato/docomment)
[![Coverage Status](https://coveralls.io/repos/k--kato/docomment/badge.svg?branch=master&service=github)](https://coveralls.io/github/k--kato/docomment?branch=master)
[![License: MIT](http://img.shields.io/badge/license-MIT-orange.svg)](LICENSE)

Generate XML documentation comments for Visual Studio Code.
Expand Down Expand Up @@ -29,7 +30,7 @@ public int bb(string s, ref int y, void * z)

## Installation

1. Install Visual Studio Code 0.10.1 or higher
1. Install Visual Studio Code 0.10.6 or higher
1. Launch Code
1. From the command palette `Ctrl`-`Shift`-`P` (Windows, Linux) or `Cmd`-`Shift`-`P` (OSX)
1. Select `Install Extension`
Expand Down
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,19 @@
"devDependencies": {
"typescript": "^1.6.2",
"vscode": "0.10.x",
"tslint": "^3.2.1"
"tslint": "^3.2.1",
"istanbul": "^0.4.2",
"coveralls": "^2.11.6",
"mocha-lcov-reporter": "^1.0.0"
},
"extensionDependencies": [
],
"isAMD": false,
"scripts": {
"vscode:prepublish": "node ./node_modules/vscode/bin/compile",
"compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
"test": "node ./node_modules/vscode/bin/test"
"test": "node ./node_modules/vscode/bin/test",
"coverage": "./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec --ui tdd ./out/test/**/*.js"
},
"icon": "images/docomment.png",
"license": "MIT",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {window, workspace, Disposable, TextEditor, TextDocumentContentChangeEven
import {IDocommentDomain} from '../Domain/IDocommentDomain';
import {IDocommentController} from './IDocommentController';

export class DocomentController implements IDocommentController {
export class DocommentController implements IDocommentController {

/*-------------------------------------------------------------------------
* Field
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {DocomentController} from '../DocomentController';
import {DocommentController} from '../DocommentController';

export class DocomentControllerCSharp extends DocomentController {
export class DocommentControllerCSharp extends DocommentController {

/*-------------------------------------------------------------------------
* Field
Expand Down
2 changes: 1 addition & 1 deletion src/Utility/StringUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class StringUtil {

public static RemoveComment(line: string): string {
if (line === null) return null;
return line.replace(/\/\/.*/, '').replace(/\/\*.*/, '');
return line.replace(/\/\/.*/, '').replace(/\/\*.*\*\//, '');
}

public static GetIndent(line: string): string {
Expand Down
4 changes: 2 additions & 2 deletions src/extension.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {ExtensionContext} from 'vscode';
import {DocommentDomainCSharp} from './Domain/Lang/DocommentDomainCSharp';
import {DocomentControllerCSharp} from './Controller/Lang/DocomentControllerCSharp';
import {DocommentControllerCSharp} from './Controller/Lang/DocommentControllerCSharp';

export function activate(context: ExtensionContext) {

const domainCSharp = new DocommentDomainCSharp();
const controllerCSharp = new DocomentControllerCSharp(domainCSharp);
const controllerCSharp = new DocommentControllerCSharp(domainCSharp);

context.subscriptions.push(controllerCSharp);
context.subscriptions.push(domainCSharp);
Expand Down
Loading

0 comments on commit d4592a9

Please sign in to comment.