Skip to content
This repository was archived by the owner on Jan 20, 2023. It is now read-only.

Commit 8b1d5cd

Browse files
JPinkneyJPinkney
committed
Fixup
1 parent 987d53f commit 8b1d5cd

File tree

4 files changed

+74
-20
lines changed

4 files changed

+74
-20
lines changed

‎che-theia-java-extension/src/browser/action/unmark-dir-as-source.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,16 @@ export class UnmarkDirAsSourceAction implements CommandContribution, MenuContrib
5353
execute: async fileUri => {
5454
const fileWidget = await this.widgetManager.tryGetWidget(FILE_NAVIGATOR_ID) as FileNavigatorWidget;
5555
if (fileWidget) {
56-
5756
const roots = await this.workspaceService.roots;
5857
const root = JavaUtils.getRootProjectURI(roots, fileUri.toString());
5958
if (roots && root) {
6059
const multiRootURI = JavaUtils.getMultiRootReadyURI(root, fileUri.toString());
6160
const treeNode = fileWidget.model.getNode(multiRootURI);
6261
if (treeNode && CompositeTreeNode.is(treeNode)) {
63-
this.performAction(root, treeNode.id);
62+
this.performAction(root, treeNode.id);
6463
}
6564
}
6665
}
67-
6866
}
6967
}));
7068
}
@@ -78,4 +76,4 @@ export class UnmarkDirAsSourceAction implements CommandContribution, MenuContrib
7876
protected newUriAwareCommandHandler(handler: UriCommandHandler<URI>): UriAwareCommandHandler<URI> {
7977
return new UriAwareCommandHandler(this.selectionService, handler);
8078
}
81-
}
79+
}

‎che-theia-java-extension/src/browser/che-theia-java-frontend-module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import {
1818
} from "@theia/core/lib/common";
1919

2020
import { ContainerModule, Container, interfaces } from "inversify";
21-
import { KeybindingContribution, KeybindingContext, WidgetFactory, TreeProps, createTreeContainer, defaultTreeProps, TreeWidget, TreeModelImpl, TreeModel } from '@theia/core/lib/browser';
21+
import { KeybindingContribution, KeybindingContext, WidgetFactory, TreeProps, createTreeContainer,
22+
defaultTreeProps, TreeWidget, TreeModelImpl, TreeModel } from '@theia/core/lib/browser';
2223

2324
import "../../src/browser/styles/icons.css";
2425
import "../../src/browser/styles/classpath.css";

‎che-theia-java-extension/src/browser/classpath/pages/classpath-tree-widget.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { ClasspathContainer, ClasspathEntry, ClasspathEntryKind } from '../class
2121
import { FileStat } from '@theia/filesystem/lib/common';
2222
import { ClasspathViewNode } from '../nodes/classpath-node';
2323

24-
export interface extendedDialogProps {
24+
export interface ExtendedDialogProps {
2525
entryKindOnAdded: ClasspathEntryKind
2626
}
2727

@@ -33,7 +33,7 @@ export abstract class AbstractClasspathTreeWidget extends TreeWidget {
3333

3434
classpathModel: IClasspathModel;
3535
activeFileStat: FileStat | undefined;
36-
fileDialogProps!: OpenFileDialogProps & extendedDialogProps;
36+
fileDialogProps!: OpenFileDialogProps & ExtendedDialogProps;
3737

3838
constructor(
3939
@inject(TreeProps) readonly props: TreeProps,
@@ -72,7 +72,8 @@ export abstract class AbstractClasspathTreeWidget extends TreeWidget {
7272

7373
protected renderTailDecorations(node: TreeNode, props: NodeProps): React.ReactNode {
7474
const c = node as ClasspathViewNode;
75-
if ((c.parent && c.parent.id === ClasspathRootID && c.classpathEntry.entryKind === ClasspathEntryKind.LIBRARY) || c.classpathEntry.entryKind === ClasspathEntryKind.SOURCE) {
75+
if ((c.parent && c.parent.id === ClasspathRootID && c.classpathEntry.entryKind === ClasspathEntryKind.LIBRARY) ||
76+
c.classpathEntry.entryKind === ClasspathEntryKind.SOURCE) {
7677
return <div className={ClasspathTreeWidget.Styles.CLASSPATHTREEWIDGET_REMOVE_ICON} onClick={() => this.removeNode(node)}></div>;
7778
}
7879
return super.renderTailDecorations(node, props);
@@ -83,7 +84,7 @@ export abstract class AbstractClasspathTreeWidget extends TreeWidget {
8384
this.classpathModel.removeClasspathNode(classpathViewNode.classpathEntry.path);
8485
this.classpathContainer.removeClasspathEntry(classpathViewNode.classpathEntry);
8586
}
86-
87+
8788
async openDialog() {
8889
if (this.activeFileStat) {
8990
const rootNode = DirNode.createRoot(this.activeFileStat, this.labelProvider.getName(this.activeFileStat), this.activeFileStat.uri);
@@ -107,12 +108,11 @@ export abstract class AbstractClasspathTreeWidget extends TreeWidget {
107108
protected isValidOpenedNode(node: TreeNode): boolean {
108109
return false;
109110
}
110-
111111
}
112112

113113
export namespace ClasspathTreeWidget {
114114
export namespace Styles {
115115
export const CLASSPATHTREEWIDGET_STYLE_ICONS = 'file-icon java-libraries-icon';
116116
export const CLASSPATHTREEWIDGET_REMOVE_ICON = 'java-remove-node-icon file-icon java-libraries-icon';
117117
}
118-
}
118+
}

‎yarn.lock

Lines changed: 64 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ aws4@^1.2.1, aws4@^1.6.0:
10601060
version "1.7.0"
10611061
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
10621062

1063-
babel-code-frame@^6.11.0, babel-code-frame@^6.26.0:
1063+
babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
10641064
version "6.26.0"
10651065
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
10661066
dependencies:
@@ -1884,7 +1884,7 @@ buffer@^4.3.0:
18841884
ieee754 "^1.1.4"
18851885
isarray "^1.0.0"
18861886

1887-
builtin-modules@^1.0.0:
1887+
builtin-modules@^1.0.0, builtin-modules@^1.1.1:
18881888
version "1.1.1"
18891889
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
18901890

@@ -2314,6 +2314,10 @@ commander@^2.11.0:
23142314
version "2.16.0"
23152315
resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50"
23162316

2317+
commander@^2.12.1:
2318+
version "2.19.0"
2319+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
2320+
23172321
commander@~2.13.0:
23182322
version "2.13.0"
23192323
resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -2910,7 +2914,7 @@ detect-libc@^1.0.2, detect-libc@^1.0.3:
29102914
version "1.0.3"
29112915
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
29122916

2913-
diff@^3.3.1, diff@^3.5.0:
2917+
diff@^3.2.0, diff@^3.3.1, diff@^3.5.0:
29142918
version "3.5.0"
29152919
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
29162920

@@ -3126,14 +3130,14 @@ esprima@^2.6.0:
31263130
version "2.7.3"
31273131
resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
31283132

3133+
esprima@^4.0.0, esprima@~4.0.0:
3134+
version "4.0.1"
3135+
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
3136+
31293137
esprima@~3.1.0:
31303138
version "3.1.3"
31313139
resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
31323140

3133-
esprima@~4.0.0:
3134-
version "4.0.1"
3135-
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
3136-
31373141
esrecurse@^4.1.0:
31383142
version "4.2.1"
31393143
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -3799,6 +3803,17 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
37993803
once "^1.3.0"
38003804
path-is-absolute "^1.0.0"
38013805

3806+
glob@^7.1.1:
3807+
version "7.1.3"
3808+
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
3809+
dependencies:
3810+
fs.realpath "^1.0.0"
3811+
inflight "^1.0.4"
3812+
inherits "2"
3813+
minimatch "^3.0.4"
3814+
once "^1.3.0"
3815+
path-is-absolute "^1.0.0"
3816+
38023817
global-modules@^1.0.0:
38033818
version "1.0.0"
38043819
resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -4559,6 +4574,13 @@ js-tokens@^3.0.2:
45594574
version "3.0.2"
45604575
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
45614576

4577+
js-yaml@^3.7.0:
4578+
version "3.12.0"
4579+
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
4580+
dependencies:
4581+
argparse "^1.0.7"
4582+
esprima "^4.0.0"
4583+
45624584
js-yaml@~3.7.0:
45634585
version "3.7.0"
45644586
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
@@ -5924,6 +5946,10 @@ path-parse@^1.0.5:
59245946
version "1.0.5"
59255947
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
59265948

5949+
path-parse@^1.0.6:
5950+
version "1.0.6"
5951+
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
5952+
59275953
[email protected]:
59285954
version "0.1.7"
59295955
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -6864,6 +6890,12 @@ resolve@^1.1.6:
68646890
dependencies:
68656891
path-parse "^1.0.5"
68666892

6893+
resolve@^1.3.2:
6894+
version "1.9.0"
6895+
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
6896+
dependencies:
6897+
path-parse "^1.0.6"
6898+
68676899
[email protected]:
68686900
version "1.0.2"
68696901
resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -7726,10 +7758,33 @@ ts-md5@^1.2.2:
77267758
version "1.2.4"
77277759
resolved "https://registry.yarnpkg.com/ts-md5/-/ts-md5-1.2.4.tgz#7030d7ba9134449deedf6f609d4b4509b94a5712"
77287760

7729-
tslib@^1.9.0:
7761+
tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
77307762
version "1.9.3"
77317763
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
77327764

7765+
[email protected]:
7766+
version "5.10.0"
7767+
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.10.0.tgz#11e26bccb88afa02dd0d9956cae3d4540b5f54c3"
7768+
dependencies:
7769+
babel-code-frame "^6.22.0"
7770+
builtin-modules "^1.1.1"
7771+
chalk "^2.3.0"
7772+
commander "^2.12.1"
7773+
diff "^3.2.0"
7774+
glob "^7.1.1"
7775+
js-yaml "^3.7.0"
7776+
minimatch "^3.0.4"
7777+
resolve "^1.3.2"
7778+
semver "^5.3.0"
7779+
tslib "^1.8.0"
7780+
tsutils "^2.12.1"
7781+
7782+
tsutils@^2.12.1:
7783+
version "2.29.0"
7784+
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
7785+
dependencies:
7786+
tslib "^1.8.1"
7787+
77337788
[email protected]:
77347789
version "0.0.0"
77357790
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -8484,4 +8539,4 @@ zip-dir@^1.0.2:
84848539
resolved "https://registry.yarnpkg.com/zip-dir/-/zip-dir-1.0.2.tgz#253f907aead62a21acd8721d8b88032b2411c051"
84858540
dependencies:
84868541
async "^1.5.2"
8487-
jszip "^2.4.0"
8542+
jszip "^2.4.0"

0 commit comments

Comments
 (0)