Skip to content

V
vscode

xxadev / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 3f8579f9 编写于 作者: M Matt Bierner
浏览文件
操作

Avoid some common type casts 

Casts can hide some type errors
上级 cd88417f
展开全部 隐藏空白更改
内联 并排
Showing with 147 addition and 147 deletion
extensions/typescript-language-features/src/features/definitions.ts
浏览文件 @ 3f8579f9
......@@ -35,13 +35,13 @@ export default class TypeScriptDefinitionProvider extends DefinitionProviderBase
const span = response.body.textSpan ? typeConverters.Range.fromTextSpan(response.body.textSpan) : undefined;
return response.body.definitions
.map(location => {
.map((location): vscode.DefinitionLink => {
const target = typeConverters.Location.fromTextSpan(this.client.toResource(location.file), location);
return {
originSelectionRange: span,
targetRange: target.range,
targetUri: target.uri,
} as vscode.DefinitionLink;
};
});
}
......
src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
浏览文件 @ 3f8579f9
......@@ -52,7 +52,7 @@ suite('QueryBuilder', () => {
test('simple text pattern', () => {
assertEqualTextQueries(
queryBuilder.text(PATTERN_INFO),
<ITextQuery>{
{
folderQueries: [],
contentPattern: PATTERN_INFO,
type: QueryType.Text
......@@ -65,7 +65,7 @@ suite('QueryBuilder', () => {
PATTERN_INFO,
[ROOT_1_URI]
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{ folder: ROOT_1_URI }],
type: QueryType.Text
......@@ -88,7 +88,7 @@ suite('QueryBuilder', () => {
PATTERN_INFO,
[ROOT_1_URI]
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{
folder: ROOT_1_URI,
......@@ -110,7 +110,7 @@ suite('QueryBuilder', () => {
[ROOT_1_URI],
{ includePattern: './bar' }
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{
folder: ROOT_1_URI,
......@@ -128,7 +128,7 @@ suite('QueryBuilder', () => {
[ROOT_1_URI],
{ includePattern: '.\\bar' }
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{
folder: ROOT_1_URI,
......@@ -158,7 +158,7 @@ suite('QueryBuilder', () => {
[ROOT_1_URI],
{ includePattern: './foo' }
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{
folder: ROOT_1_URI,
......@@ -201,7 +201,7 @@ suite('QueryBuilder', () => {
PATTERN_INFO,
[ROOT_1_URI, ROOT_2_URI, ROOT_3_URI]
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [
{ folder: ROOT_1_URI, excludePattern: patternsToIExpression('foo/**/*.js') },
......@@ -219,7 +219,7 @@ suite('QueryBuilder', () => {
[ROOT_1_URI, ROOT_2_URI, ROOT_3_URI],
{ includePattern: './root2/src' }
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [
{
......@@ -245,7 +245,7 @@ suite('QueryBuilder', () => {
[ROOT_1_URI],
{ excludePattern: 'foo' }
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{
folder: ROOT_1_URI
......@@ -262,7 +262,7 @@ suite('QueryBuilder', () => {
undefined,
{ filePattern: ` ${content} ` }
),
<IFileQuery>{
{
folderQueries: [],
filePattern: content,
type: QueryType.File
......@@ -276,7 +276,7 @@ suite('QueryBuilder', () => {
[ROOT_1_URI],
{ excludePattern: './bar' }
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{
folder: ROOT_1_URI,
......@@ -291,7 +291,7 @@ suite('QueryBuilder', () => {
[ROOT_1_URI],
{ excludePattern: './bar/**/*.ts' }
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{
folder: ROOT_1_URI,
......@@ -306,7 +306,7 @@ suite('QueryBuilder', () => {
[ROOT_1_URI],
{ excludePattern: '.\\bar\\**\\*.ts' }
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{
folder: ROOT_1_URI,
......@@ -323,7 +323,7 @@ suite('QueryBuilder', () => {
[ROOT_1_URI],
{ extraFileResources: [getUri('/foo/bar.js')] }
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{
folder: ROOT_1_URI
......@@ -341,7 +341,7 @@ suite('QueryBuilder', () => {
excludePattern: '*.js'
}
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{
folder: ROOT_1_URI
......@@ -359,7 +359,7 @@ suite('QueryBuilder', () => {
includePattern: '*.txt'
}
),
<ITextQuery>{
{
contentPattern: PATTERN_INFO,
folderQueries: [{
folder: ROOT_1_URI
......@@ -374,7 +374,7 @@ suite('QueryBuilder', () => {
function testSimpleIncludes(includePattern: string, expectedPatterns: string[]): void {
assert.deepEqual(
queryBuilder.parseSearchPaths(includePattern),
<ISearchPathsResult>{
{
pattern: patternsToIExpression(...expectedPatterns)
},
includePattern);
......@@ -405,26 +405,26 @@ suite('QueryBuilder', () => {
const cases: [string, ISearchPathsResult][] = [
[
fixPath('/foo/bar'),
<ISearchPathsResult>{
{
searchPaths: [{ searchPath: getUri('/foo/bar') }]
}
],
[
fixPath('/foo/bar') + ',' + 'a',
<ISearchPathsResult>{
{
searchPaths: [{ searchPath: getUri('/foo/bar') }],
pattern: patternsToIExpression(...globalGlob('a'))
}
],
[
fixPath('/foo/bar') + ',' + fixPath('/1/2'),
<ISearchPathsResult>{
{
searchPaths: [{ searchPath: getUri('/foo/bar') }, { searchPath: getUri('/1/2') }]
}
],
[
fixPath('/foo/bar') + ',' + fixPath('/foo/../foo/bar/fooar/..'),
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: getUri('/foo/bar')
}]
......@@ -432,7 +432,7 @@ suite('QueryBuilder', () => {
],
[
fixPath('/foo/bar/**/*.ts'),
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: getUri('/foo/bar'),
pattern: patternsToIExpression('**/*.ts', '**/*.ts/**')
......@@ -441,7 +441,7 @@ suite('QueryBuilder', () => {
],
[
fixPath('/foo/bar/*a/b/c'),
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: getUri('/foo/bar'),
pattern: patternsToIExpression('*a/b/c', '*a/b/c/**')
......@@ -450,7 +450,7 @@ suite('QueryBuilder', () => {
],
[
fixPath('/*a/b/c'),
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: getUri('/'),
pattern: patternsToIExpression('*a/b/c', '*a/b/c/**')
......@@ -459,7 +459,7 @@ suite('QueryBuilder', () => {
],
[
fixPath('/foo/{b,c}ar'),
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: getUri('/foo'),
pattern: patternsToIExpression('{b,c}ar', '{b,c}ar/**')
......@@ -475,20 +475,20 @@ suite('QueryBuilder', () => {
const cases: [string, ISearchPathsResult][] = [
[
'~/foo/bar',
<ISearchPathsResult>{
{
searchPaths: [{ searchPath: getUri(userHome, '/foo/bar') }]
}
],
[
'~/foo/bar, a',
<ISearchPathsResult>{
{
searchPaths: [{ searchPath: getUri(userHome, '/foo/bar') }],
pattern: patternsToIExpression(...globalGlob('a'))
}
],
[
fixPath('/foo/~/bar'),
<ISearchPathsResult>{
{
searchPaths: [{ searchPath: getUri('/foo/~/bar') }]
}
],
......@@ -500,7 +500,7 @@ suite('QueryBuilder', () => {
const cases: [string, ISearchPathsResult][] = [
[
'./a',
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a', 'a/**')
......@@ -509,7 +509,7 @@ suite('QueryBuilder', () => {
],
[
'./a/',
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a', 'a/**')
......@@ -518,7 +518,7 @@ suite('QueryBuilder', () => {
],
[
'./a/*b/c',
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a/*b/c', 'a/*b/c/**')
......@@ -527,7 +527,7 @@ suite('QueryBuilder', () => {
],
[
'./a/*b/c, ' + fixPath('/project/foo'),
<ISearchPathsResult>{
{
searchPaths: [
{
searchPath: ROOT_1_URI,
......@@ -540,7 +540,7 @@ suite('QueryBuilder', () => {
],
[
'./a/b/,./c/d',
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a/b', 'a/b/**', 'c/d', 'c/d/**')
......@@ -550,7 +550,7 @@ suite('QueryBuilder', () => {
// TODO @ rob
// [
// '../',
// <ISearchPathsResult>{
// {
// searchPaths: [{
// searchPath: getUri('foo/')
// }]
......@@ -568,7 +568,7 @@ suite('QueryBuilder', () => {
const cases: [string, ISearchPathsResult][] = [
[
'./root1',
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: getUri(ROOT_1)
}]
......@@ -576,7 +576,7 @@ suite('QueryBuilder', () => {
],
[
'./root2',
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: getUri(ROOT_2),
}]
......@@ -584,7 +584,7 @@ suite('QueryBuilder', () => {
],
[
'./root1/a/**/b, ./root2/**/*.txt',
<ISearchPathsResult>{
{
searchPaths: [
{
searchPath: ROOT_1_URI,
......@@ -609,7 +609,7 @@ suite('QueryBuilder', () => {
const cases: [string, ISearchPathsResult][] = [
[
'./foldername',
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: ROOT_1_URI
}]
......@@ -617,7 +617,7 @@ suite('QueryBuilder', () => {
],
[
'./foldername/foo',
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('foo', 'foo/**')
......@@ -637,19 +637,19 @@ suite('QueryBuilder', () => {
const cases: [string, ISearchPathsResult][] = [
[
'',
<ISearchPathsResult>{
{
searchPaths: undefined
}
],
[
'./',
<ISearchPathsResult>{
{
searchPaths: undefined
}
],
[
'./root1',
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: getUri(ROOT_1)
}]
......@@ -657,7 +657,7 @@ suite('QueryBuilder', () => {
],
[
'./root1,./',
<ISearchPathsResult>{
{
searchPaths: [{
searchPath: getUri(ROOT_1)
}]
......@@ -665,7 +665,7 @@ suite('QueryBuilder', () => {
],
[
'./rootB',
<ISearchPathsResult>{
{
searchPaths: [
{
searchPath: getUri(ROOT_2),
......@@ -677,7 +677,7 @@ suite('QueryBuilder', () => {
],
[
'./rootB/a/**/b, ./rootB/b/**/*.txt',
<ISearchPathsResult>{
{
searchPaths: [
{
searchPath: getUri(ROOT_2),
......@@ -691,7 +691,7 @@ suite('QueryBuilder', () => {
],
[
'./root1/**/foo/, bar/',
<ISearchPathsResult>{
{
pattern: patternsToIExpression('**/bar', '**/bar/**'),
searchPaths: [
{
......
src/vs/workbench/services/preferences/common/preferencesModels.ts
浏览文件 @ 3f8579f9
......@@ -195,7 +195,7 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti
}
const metadata = this.collectMetadata(resultGroups);
return <IFilterResult>{
return {
allGroups: this.settingsGroups,
filteredGroups: filteredGroup ? [filteredGroup] : [],
matches,
......
src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
浏览文件 @ 3f8579f9
......@@ -78,7 +78,7 @@ suite('Search-integration', function () {
this.timeout(1000 * 60); // increase timeout for this suite
test('Text: GameOfLife', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'GameOfLife' },
......@@ -88,7 +88,7 @@ suite('Search-integration', function () {
});
test('Text: GameOfLife (RegExp)', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'Game.?fL\\w?fe', isRegExp: true }
......@@ -98,7 +98,7 @@ suite('Search-integration', function () {
});
test('Text: GameOfLife (PCRE2 RegExp)', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
usePCRE2: true,
......@@ -109,7 +109,7 @@ suite('Search-integration', function () {
});
test('Text: GameOfLife (RegExp to EOL)', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'GameOfLife.*', isRegExp: true }
......@@ -119,7 +119,7 @@ suite('Search-integration', function () {
});
test('Text: GameOfLife (Word Match, Case Sensitive)', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'GameOfLife', isWordMatch: true, isCaseSensitive: true }
......@@ -129,7 +129,7 @@ suite('Search-integration', function () {
});
test('Text: GameOfLife (Word Match, Spaces)', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: ' GameOfLife ', isWordMatch: true }
......@@ -139,7 +139,7 @@ suite('Search-integration', function () {
});
test('Text: GameOfLife (Word Match, Punctuation and Spaces)', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: ', as =', isWordMatch: true }
......@@ -149,7 +149,7 @@ suite('Search-integration', function () {
});
test('Text: Helvetica (UTF 16)', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'Helvetica' }
......@@ -159,7 +159,7 @@ suite('Search-integration', function () {
});
test('Text: e', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'e' }
......@@ -233,7 +233,7 @@ suite('Search-integration', function () {
test('Text: a (capped)', () => {
const maxResults = 520;
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'a' },
......@@ -247,7 +247,7 @@ suite('Search-integration', function () {
});
test('Text: a (no results)', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'ahsogehtdas' }
......@@ -257,7 +257,7 @@ suite('Search-integration', function () {
});
test('Text: -size', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: '-size' }
......@@ -312,7 +312,7 @@ suite('Search-integration', function () {
});
test('Text: 语', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: '语' }
......@@ -330,7 +330,7 @@ suite('Search-integration', function () {
});
test('Multiple matches on line: h\\d,', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'h\\d,', isRegExp: true }
......@@ -345,7 +345,7 @@ suite('Search-integration', function () {
});
test('Search with context matches', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'compiler.typeCheck();' },
......@@ -367,7 +367,7 @@ suite('Search-integration', function () {
suite('error messages', () => {
test('invalid encoding', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: [
{
......@@ -388,7 +388,7 @@ suite('Search-integration', function () {
});
test('invalid regex', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: ')', isRegExp: true },
......@@ -404,7 +404,7 @@ suite('Search-integration', function () {
});
test('invalid glob', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'foo' },
......@@ -423,7 +423,7 @@ suite('Search-integration', function () {
});
test('invalid literal', () => {
const config = <ITextQuery>{
const config: ITextQuery = {
type: QueryType.Text,
folderQueries: ROOT_FOLDER_QUERY,
contentPattern: { pattern: 'foo\nbar', isRegExp: true }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或