Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

tslint

Browse Source
This commit is contained in:
Alex Dima
2016-02-13 00:10:03 +01:00
parent 7ec1904233
commit 021995c100
57 changed files with 128 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/json/server/src/configuration.ts
View File

@@ -5,7 +5,6 @@
'use strict';
import nls = require('./utils/nls');
import {IJSONSchema} from './json-toolbox/jsonSchema';
import {ISchemaContributions} from './jsonSchemaService';

3
extensions/json/server/src/jsonCompletion.ts
View File

@@ -5,14 +5,13 @@
'use strict';
import URI from './utils/uri';
import Parser = require('./jsonParser');
import SchemaService = require('./jsonSchemaService');
import JsonSchema = require('./json-toolbox/jsonSchema');
import nls = require('./utils/nls');
import {IJSONWorkerContribution} from './jsonContributions';
import {CompletionItem, CompletionItemKind, CompletionList, CompletionOptions, ITextDocument, TextDocumentIdentifier, TextDocumentPosition, Range, TextEdit} from 'vscode-languageserver';
import {CompletionItem, CompletionItemKind, CompletionList, ITextDocument, TextDocumentPosition, Range, TextEdit} from 'vscode-languageserver';
export interface ISuggestionsCollector {
add(suggestion: CompletionItem): void;

1
extensions/json/server/src/jsonDocumentSymbols.ts
View File

@@ -5,7 +5,6 @@
'use strict';
import Parser = require('./jsonParser');
import SchemaService = require('./jsonSchemaService');
import Strings = require('./utils/strings');
import {SymbolInformation, SymbolKind, ITextDocument, Range, Location} from 'vscode-languageserver';

7
extensions/json/server/src/jsonHover.ts
View File

@@ -9,7 +9,7 @@ import Parser = require('./jsonParser');
import SchemaService = require('./jsonSchemaService');
import {IJSONWorkerContribution} from './jsonContributions';
import {Hover, ITextDocument, TextDocumentPosition, Range, MarkedString, RemoteConsole} from 'vscode-languageserver';
import {Hover, ITextDocument, TextDocumentPosition, Range, MarkedString} from 'vscode-languageserver';
export class JSONHover {
@@ -25,7 +25,6 @@ export class JSONHover {
let offset = document.offsetAt(textDocumentPosition.position);
let node = doc.getNodeFromOffset(offset);
let originalNode = node;
// use the property description when hovering over an object key
if (node && node.type === 'string') {
@@ -55,7 +54,7 @@ export class JSONHover {
}
return true;
});
var createHover = (contents: MarkedString[]) => {
let range = Range.create(document.positionAt(node.start), document.positionAt(node.end));
let result: Hover = {
@@ -64,7 +63,7 @@ export class JSONHover {
};
return result;
};
let location = node.getNodeLocation();
for (let i = this.contributions.length - 1; i >= 0; i--) {
let contribution = this.contributions[i];

1
extensions/json/server/src/jsonParser.ts
View File

@@ -8,7 +8,6 @@ import nls = require('./utils/nls');
import Json = require('./json-toolbox/json');
import JsonSchema = require('./json-toolbox/jsonSchema');
import {JSONLocation} from './jsonLocation';
import SchemaService = require('./jsonSchemaService');
export interface IRange {
start: number;

2
extensions/json/server/src/jsonSchemaService.ts
View File

@@ -10,8 +10,6 @@ import {IJSONSchema} from './json-toolbox/jsonSchema';
import {IXHROptions, IXHRResponse, getErrorStatusDescription} from './utils/httpRequest';
import URI from './utils/uri';
import Strings = require('./utils/strings');
import {parse as parseURL} from 'url';
import path = require('path');
import Parser = require('./jsonParser');
export interface IJSONSchemaService {

1
extensions/json/server/src/jsoncontributions/globPatternContribution.ts
View File

@@ -8,7 +8,6 @@ import {MarkedString, CompletionItemKind, CompletionItem} from 'vscode-languages
import Strings = require('../utils/strings');
import nls = require('../utils/nls');
import {IJSONWorkerContribution, ISuggestionsCollector} from '../jsonContributions';
import {IRequestService} from '../jsonSchemaService';
import {JSONLocation} from '../jsonLocation';
let globProperties:CompletionItem[] = [

2
extensions/json/server/src/jsoncontributions/packageJSONContribution.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import {MarkedString, CompletionItemKind, CompletionItem} from 'vscode-languageserver';
import {MarkedString, CompletionItemKind} from 'vscode-languageserver';
import Strings = require('../utils/strings');
import nls = require('../utils/nls');
import {IJSONWorkerContribution, ISuggestionsCollector} from '../jsonContributions';

2
extensions/json/server/src/jsoncontributions/projectJSONContribution.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import {MarkedString, CompletionItemKind, CompletionItem} from 'vscode-languageserver';
import {MarkedString, CompletionItemKind} from 'vscode-languageserver';
import Strings = require('../utils/strings');
import nls = require('../utils/nls');
import {IJSONWorkerContribution, ISuggestionsCollector} from '../jsonContributions';

6
extensions/json/server/src/server.ts
View File

@@ -6,10 +6,10 @@
import {
IPCMessageReader, IPCMessageWriter,
createConnection, IConnection, TextDocumentSyncKind,
createConnection, IConnection,
TextDocuments, ITextDocument, Diagnostic, DiagnosticSeverity,
InitializeParams, InitializeResult, TextDocumentIdentifier, TextDocumentPosition, CompletionList,
CompletionItem, CompletionItemKind, Files, Hover, SymbolInformation, TextEdit, DocumentFormattingParams,
Hover, SymbolInformation, DocumentFormattingParams,
DocumentRangeFormattingParams, NotificationType, RequestType
} from 'vscode-languageserver';
@@ -18,7 +18,7 @@ import path = require('path');
import fs = require('fs');
import URI from './utils/uri';
import Strings = require('./utils/strings');
import {IWorkspaceContextService, ITelemetryService, JSONSchemaService, ISchemaContributions, ISchemaAssociations} from './jsonSchemaService';
import {JSONSchemaService, ISchemaAssociations} from './jsonSchemaService';
import {parse as parseJSON, ObjectASTNode, JSONDocument} from './jsonParser';
import {JSONCompletion} from './jsonCompletion';
import {JSONHover} from './jsonHover';

4
extensions/json/server/src/test/textEditSupport.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import {ITextDocument, DocumentFormattingParams, Range, Position, FormattingOptions, TextEdit} from 'vscode-languageserver';
import {ITextDocument, TextEdit} from 'vscode-languageserver';
import assert = require('assert');
export function applyEdits(document: ITextDocument, edits: TextEdit[]) : string {
@@ -19,5 +19,5 @@ export function applyEdits(document: ITextDocument, edits: TextEdit[]) : string
formatted = formatted.substring(0, startOffset) + e.newText + formatted.substring(endOffset, formatted.length);
lastOffset = startOffset;
});
return formatted;
return formatted;
}

2
extensions/json/server/src/utils/uri.ts
View File

@@ -190,7 +190,7 @@ export default class URI {
ret._path = match[5] || ret._path;
ret._query = match[7] || ret._query;
ret._fragment = match[9] || ret._fragment;
};
}
URI._validate(ret);
return ret;
}