Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into joh/eslint-rules

Browse Source
This commit is contained in:
Johannes Rieken
2019-12-30 10:52:40 +01:00
parent 54d20309fa ccd38490b2
commit 1dbc699a78
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/json-language-features/extension.webpack.config.js
+2 -2
View File
@@ -9,7 +9,7 @@
const withDefaults = require('../shared.webpack.config');
const path = require('path');
var webpack = require('webpack');
const webpack = require('webpack');
const config = withDefaults({
context: path.join(__dirname, 'client'),
@@ -25,4 +25,4 @@ const config = withDefaults({
// add plugin, don't replace inherited
config.plugins.push(new webpack.IgnorePlugin(/vertx/)); // request-light dependency
module.exports = config;
module.exports = config;
extensions/json-language-features/server/extension.webpack.config.js
+1 -1
View File
@@ -9,7 +9,7 @@
const withDefaults = require('../../shared.webpack.config');
const path = require('path');
var webpack = require('webpack');
const webpack = require('webpack');
const config = withDefaults({
context: path.join(__dirname),
src/vs/workbench/contrib/files/browser/files.ts
+1 -1
View File
@@ -57,7 +57,7 @@ export function getMultiSelectedResources(resource: URI | object | undefined, li
const list = listService.lastFocusedList;
if (list?.getHTMLElement() === document.activeElement) {
// Explorer
if (list instanceof AsyncDataTree) {
if (list instanceof AsyncDataTree && list.getFocus().every(item => item instanceof ExplorerItem)) {
// Explorer
const context = explorerService.getContext(true);
if (context.length) {