Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3d3763f

Browse files
authored
Fixlaunch.json creation when using non-English display languages. (microsoft#4480)
* Fix `launch.json` creation when using non-English display languages.* Update changelog.
1 parentfebccce commit3d3763f

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

‎Extension/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
#C/C++ for Visual Studio Code Change Log
22

3+
##Version 0.26.1: October 28, 2019
4+
###Bug Fixes
5+
* Fix`launch.json` creation when using non-English display languages.[#4464](https://github.com/microsoft/vscode-cpptools/issues/4464)
6+
* Fix CHS translation.[#4422](https://github.com/microsoft/vscode-cpptools/issues/4422)
7+
* Fix debugging hang when Windows 10 Beta Unicode (UTF-8) support is enabled.[#1527](https://github.com/microsoft/vscode-cpptools/issues/1527)
8+
39
##Version 0.26.0: October 15, 2019
410
###New Features
511
* Add localization support (translated text) via`Configure Display Language`.[#7](https://github.com/microsoft/vscode-cpptools/issues/7)
@@ -17,6 +23,8 @@
1723

1824
###Bug Fixes
1925
* Fix querying of non-ENU compilers.[#2874](https://github.com/microsoft/vscode-cpptools/issues/2874)
26+
* Fix IntelliSense error with`constexpr const char* s[] = { "" }`.[#2939](https://github.com/microsoft/vscode-cpptools/issues/2939)
27+
* Add support for C++20 designated initializers for cl and gcc.[#3491](https://github.com/Microsoft/vscode-cpptools/issues/3491)
2028
* Fix`Find All References` not confirming references of method overrides in an inheritance hierarchy.[#4078](https://github.com/microsoft/vscode-cpptools/issues/4078)
2129
* Fix missing references on the last line.[#4150](https://github.com/microsoft/vscode-cpptools/issues/4150)
2230
* Fix`Go to Definition` on implicit default constructors.[#4162](https://github.com/microsoft/vscode-cpptools/issues/4162)

‎Extension/src/Debugger/configurationProvider.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFo
2424
constlocalize:nls.LocalizeFunc=nls.loadMessageBundle();
2525

2626
functionisDebugLaunchStr(str:string):boolean{
27-
returnstr==="(gdb)Launch"||str==="(lldb)Launch"||str==="(Windows)Launch";
27+
returnstr.startsWith("(gdb)")||str.startsWith("(lldb)")||str.startsWith("(Windows)");
2828
}
2929

3030
/*
@@ -41,7 +41,7 @@ export class QuickPickConfigurationProvider implements vscode.DebugConfiguration
4141

4242
asyncprovideDebugConfigurations(folder:vscode.WorkspaceFolder|undefined,token?:vscode.CancellationToken):Promise<vscode.DebugConfiguration[]>{
4343
constconfigs:vscode.DebugConfiguration[]=awaitthis.underlyingProvider.provideDebugConfigurations(folder,token);
44-
constdefaultConfig:vscode.DebugConfiguration=configs.find(config=>isDebugLaunchStr(config.name));
44+
constdefaultConfig:vscode.DebugConfiguration=configs.find(config=>isDebugLaunchStr(config.name)&&config.request==="launch");
4545
console.assert(defaultConfig);
4646
consteditor:vscode.TextEditor=vscode.window.activeTextEditor;
4747
if(!editor||!util.fileIsCOrCppSource(editor.document.fileName)||configs.length<=1){
@@ -105,16 +105,16 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
105105
returnPromise.resolve(this.provider.getInitialConfigurations(this.type));
106106
}
107107
constdefaultConfig:vscode.DebugConfiguration=this.provider.getInitialConfigurations(this.type).find(config=>{
108-
returnisDebugLaunchStr(config.name);
108+
returnisDebugLaunchStr(config.name)&&config.request==="launch";
109109
});
110110
console.assert(defaultConfig,"Could not find default debug configuration.");
111111

112112
constplatformInfo:PlatformInformation=awaitPlatformInformation.GetPlatformInformation();
113113
constplatform:string=platformInfo.platform;
114114

115-
// Filter out build tasks that don't match the currentlyselectede debug configuration type.
115+
// Filter out build tasks that don't match the currentlyselected debug configuration type.
116116
buildTasks=buildTasks.filter((task:vscode.Task)=>{
117-
if(defaultConfig.name==="(Windows)Launch"){
117+
if(defaultConfig.name.startsWith("(Windows)")){
118118
if(task.name.startsWith("cl.exe")){
119119
returntrue;
120120
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp