Initial commit for support vscode.workspace.findFiles feature #3128
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 tasks
evidolob
added
plug-in system
benoitf
reviewed
Oct 11, 2018
| let j = 0; | ||
| const promises: Promise<any>[] = new Array(); | ||
| for (const root of this.roots) { | ||
| console.log('******** >> ' + root.uri); |
There was a problem hiding this comment.
hello, I think it needs to be removed
| promises[j++] = this.fileSearchService.find(includePattern, {rootUri: root.uri}).then(value => { | ||
| const paths: string[] = new Array(); | ||
| let i = 0; | ||
| value.forEach(function (item) { |
| @@ -39,6 +39,7 @@ import { | |||
| DefinitionLink, | |||
| DocumentLink | |||
| } from './model'; | |||
| import {CancellationToken} from '@theia/plugin'; | |||
There was a problem hiding this comment.
there is an import
import * as theia from '@theia/plugin';
so you should use theia.CancellationToken (without adding this import)
| @@ -77,6 +77,8 @@ import { TerminalServiceExtImpl } from './terminal-ext'; | |||
| import { LanguagesExtImpl, score } from './languages'; | |||
| import { fromDocumentSelector } from './type-converters'; | |||
| import { DialogsExtImpl } from './dialogs'; | |||
| import { GlobPattern} from '@theia/plugin'; | |||
There was a problem hiding this comment.
there is already an import
import * as theia from '@theia/plugin';
| @@ -19,24 +19,29 @@ import { WorkspaceExt, MAIN_RPC_CONTEXT, WorkspaceMain, WorkspaceFolderPickOptio | |||
| import { RPCProtocol } from '../../api/rpc-protocol'; | |||
| import { WorkspaceService } from '@theia/workspace/lib/browser'; | |||
| import Uri from 'vscode-uri'; | |||
| import { WorkspaceFoldersChangeEvent, WorkspaceFolder } from '@theia/plugin'; | |||
| import { UriComponents } from '../../common/uri-components'; | |||
| import { WorkspaceFoldersChangeEvent, WorkspaceFolder, CancellationToken } from '@theia/plugin'; | |||
There was a problem hiding this comment.
please use instead
import * as theia from '@theia/plugin';
| } | ||
|
|
||
| let excludePatternOrDisregardExcludes: string | false; | ||
| if (exclude === null) { |
There was a problem hiding this comment.
do we have somtimes null ? AFAIK in theia we mostly have undefined or values
There was a problem hiding this comment.
Yes, we should not use null at all
evidolob
reviewed
Oct 11, 2018
| } | ||
|
|
||
| let excludePatternOrDisregardExcludes: string | false; | ||
| if (exclude === null) { |
There was a problem hiding this comment.
Yes, we should not use null at all
| return Promise.all(promises).then(value => { | ||
| let i = 0; | ||
| value.forEach(function (path) { | ||
| // let path: string; |
There was a problem hiding this comment.
Commented code should be removed
| @@ -14,12 +14,13 @@ | |||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | |||
| ********************************************************************************/ | |||
|
|
|||
| import { WorkspaceFolder, WorkspaceFoldersChangeEvent, WorkspaceFolderPickOptions, GlobPattern, FileSystemWatcher } from '@theia/plugin'; | |||
| import { WorkspaceFolder, WorkspaceFoldersChangeEvent, WorkspaceFolderPickOptions, GlobPattern, FileSystemWatcher, Uri } from '@theia/plugin'; | |||
There was a problem hiding this comment.
You do not need Uri from '@theia/plugin', you can use URI that you imported below
evidolob
approved these changes
Oct 12, 2018
|
@vparfonov FYI you need to use rebase only instead of "merge with master" in your branch, as it's the only way of merging PR on Theia repo |
benoitf
reviewed
Oct 16, 2018
| @@ -125,4 +130,29 @@ export class WorkspaceMainImpl implements WorkspaceMain { | |||
| }); | |||
| } | |||
|
|
|||
| $startFileSearch(includePattern: string, excludePatternOrDisregardExcludes?: string | false, | |||
| maxResults?: number, token?: theia.CancellationToken): Promise<UriComponents[]> { | |||
| const uris: UriComponents[] = new Array(); | |||
There was a problem hiding this comment.
I think you can use
const uris: UriComponents[] = [];
benoitf
approved these changes
Oct 16, 2018
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Vitalii Parfonov vparfonov@redhat.com
Find files across all workspace folders in the workspace.
More details https://code.visualstudio.com/docs/extensionAPI/vscode-api#_workspace 'findFiles'