Skip to content

Commit a18b91b

Browse files
authored
Merge pull request #8303 from microsoft/main
2 parents a06d8e6 + 6b00343 commit a18b91b

File tree

24 files changed

+79
-62
lines changed

24 files changed

+79
-62
lines changed

.github/actions/StaleCloser/StaleCloser.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/actions/StaleCloser/StaleCloser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export class StaleCloser extends ActionBase {
9797
}
9898
console.log(`Closing issue ${hydrated.number}.`)
9999
} else {
100-
// Ping
100+
// Ping
101101
if (hydrated.updatedAt < pingTimestamp && hydrated.assignee) {
102102
console.log(
103103
`Last comment on issue ${hydrated.number} by ${lastComment.author.name}. Pinging @${hydrated.assignee}`,

Build/lldb-mi/lldb-mi.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
steps:
1818
- task: CmdLine@2
1919
displayName: 'Install Dependencies'
20-
inputs:
20+
inputs:
2121
script: brew install cmake ninja swig
2222
continueOnError: true
2323

2424
- task: CmdLine@2
2525
displayName: 'Build LLVM Project'
26-
inputs:
26+
inputs:
2727
script: |
2828
log_and_exec_cmd() {
2929
echo "##[command] $1"
@@ -32,7 +32,7 @@ jobs:
3232
3333
log_and_exec_cmd "cd $(Build.StagingDirectory)"
3434
log_and_exec_cmd "mkdir $(Build.StagingDirectory)/buildspace"
35-
35+
3636
log_and_exec_cmd "git clone $(llvm_repo) llvm-project"
3737
log_and_exec_cmd "cd llvm-project"
3838
log_and_exec_cmd "git checkout $(llvm_branch)"

Code Samples/BoxConsoleSample/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ This option will generate a tasks.json file for you, build your active source fi
2121

2222
### F5
2323
Another way to begin building and debugging your active file is to execute the command by pressing <kbd>F5</kbd>. This method will configure
24-
both a tasks.json and launch.json file for you, build your active source file, and then launch the debugger.
24+
both a tasks.json and launch.json file for you, build your active source file, and then launch the debugger.

Code Samples/Fib/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Fib
22

3-
This code sample is to show debugging. Update `launch.json` and `tasks.json` in the `.vscode` folder to use your setup to build and debug.
3+
This code sample is to show debugging. Update `launch.json` and `tasks.json` in the `.vscode` folder to use your setup to build and debug.

Code Samples/Fib/thread.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,34 @@ static int fib(int n){
1515
switch (n) {
1616
case 0: return 1;
1717
case 1: return 1;
18-
default: return (fib(n-2) + fib(n-1));
19-
}
18+
default: return (fib(n-2) + fib(n-1));
19+
}
2020
}
2121

2222
void * thread_proc(void* ctx)
2323
{
2424
int tid = g_tid++;
25-
25+
2626
char thread_name[16];
2727
sprintf(thread_name, "Thread %d", tid);
2828
#ifdef __APPLE__
2929
pthread_setname_np(thread_name);
3030
#else
3131
pthread_setname_np(pthread_self(), thread_name);
3232
#endif
33-
33+
3434
// Random delay, 0 - 0.5 sec
3535
timespec ts;
3636
ts.tv_sec = 0;
3737
ts.tv_nsec = 500000000 + ((float)rand() / (float)RAND_MAX) * 500000000;
3838
nanosleep(&ts, NULL);
39-
39+
4040
volatile int i = 0;
4141
while (i <= 30) {
4242
std::cout << "Thread " << tid << ": fib(" << i << ") = " << fib(i) << std::endl;
4343
i++;
4444
nanosleep(&ts, NULL);
4545
}
46-
46+
4747
std::cout << thread_name << " exited!" << std::endl;
4848
}

Documentation/Debugger/natvis/natvis.xsd

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
</xs:annotation>
241241
</xs:attribute>
242242
</xs:complexType>
243-
243+
244244
<!-- Attributes for elements that support filtering by view-->
245245
<xs:attributeGroup name="ViewConstraints">
246246
<xs:attribute name="IncludeView" type ="ViewIncludeType" use="optional" />
@@ -335,9 +335,9 @@
335335
are evaluated in the context of the node.
336336
</xs:documentation>
337337
</xs:annotation>
338-
</xs:attribute>
338+
</xs:attribute>
339339
</xs:attributeGroup>
340-
340+
341341
<xs:complexType name="ListItemsNodeType">
342342
<xs:annotation>
343343
<xs:documentation>Expression that points to value of the linked list node. It can be left empty or have 'this' to refer to the linked list node itself. This expression is evaluated under the context of the linked list node and not the parent linked list type.</xs:documentation>
@@ -402,7 +402,7 @@
402402
<xs:documentation>
403403
Indicates that the item should use the icon associated with general data.
404404
</xs:documentation>
405-
</xs:annotation>
405+
</xs:annotation>
406406
</xs:enumeration>
407407
<xs:enumeration value="Method">
408408
<xs:annotation>
@@ -864,16 +864,16 @@
864864
<xs:complexType name="MostDerivedObjectType">
865865
<xs:annotation>
866866
<xs:documentation>
867-
Specifies an expression which evaluates to the current object, casted to its most-derived type.
868-
869-
In most cases, the debugger is able to automatically determine an object's most-derived type, in which case use of the &lt;MostDerivedType&gt;
867+
Specifies an expression which evaluates to the current object, casted to its most-derived type.
868+
869+
In most cases, the debugger is able to automatically determine an object's most-derived type, in which case use of the &lt;MostDerivedType&gt;
870870
element is unecessary. Automatic determination of an object's most-derived type requires the object to be an instance of a C++ class, with a
871871
compiler-generated virtual function table. This is sufficient for most class-hierarchies; however, custom logic may occasionally be necessary
872-
when dealing with a class hierarchy that does not contain virtual functions, or when the virtual function table is manually constructed by the
872+
when dealing with a class hierarchy that does not contain virtual functions, or when the virtual function table is manually constructed by the
873873
application code.
874874
</xs:documentation>
875875
</xs:annotation>
876-
876+
877877
<xs:simpleContent>
878878
<xs:extension base="StringType">
879879
<xs:attributeGroup ref="CommonAttributes" />
@@ -935,12 +935,12 @@
935935
<xs:annotation>
936936
<xs:documentation>
937937
Indicates that the given type is a smart pointer. The text inside this element specifies the expression to evaluate the underlying pointer.
938-
938+
939939
The &lt;SmartPointer&gt; element has the following effects:
940940
- If no alternative &lt;DisplayString&gt; element is provided (or all &lt;DisplayString&gt; elements have failed conditions), the underlying pointer will be the display string
941941
- If no alternative &lt;StringView&gt; element is provided (or all &lt;StringView&gt; elements have failed conditions), the underlying pointer will be the string view, if it has one.
942942
- If no alternative &lt;Expand&gt; element is provided, the expansion of the smart pointer will be the expansion of the underlying pointer.
943-
- The smart pointer class will also support overloaded operators as determined by the &lt;Usage&gt; attribute. You can opt out of this behavior by specifying
943+
- The smart pointer class will also support overloaded operators as determined by the &lt;Usage&gt; attribute. You can opt out of this behavior by specifying
944944
'DefaultExpansion=&quot;false&quot;'
945945
</xs:documentation>
946946
</xs:annotation>
@@ -949,7 +949,7 @@
949949
<xs:attributeGroup ref="CommonAttributes_NoCondition" />
950950
<xs:attribute name="Usage" type="SmartPointerUsage" use="required">
951951
<xs:annotation>
952-
<xs:documentation>Indicates which combinations of operators this smart pointer object supports.
952+
<xs:documentation>Indicates which combinations of operators this smart pointer object supports.
953953
</xs:documentation>
954954
</xs:annotation>
955955
</xs:attribute>
@@ -1004,10 +1004,10 @@
10041004
<xs:documentation>Specifies an optional priority to assign to this entry for type matching. Higher priority entries within a particular file or directory
10051005
are checked first. &lt;Type&gt; entries that do not specify a priority receive default priority of &quot;Medium&quot; &lt;AlternativeType&gt; entries which do not specify a priority
10061006
will inherit the priority of the enclosing &lt;Type&gt; element. The priority is only used to disambiguate type matching when all other means of disambiguation are unavailable.
1007-
For example, entries with more specific template instantiations, module constraints, or view constraints will take priority regardless of any priority values specified.
1008-
Similarly, regardless of priority, natvis files that are part of a loaded project will always take precedence over files in the user natvis directory,
1009-
which will, in turn, take precedence over files in the system-wide natvis directory.
1010-
1007+
For example, entries with more specific template instantiations, module constraints, or view constraints will take priority regardless of any priority values specified.
1008+
Similarly, regardless of priority, natvis files that are part of a loaded project will always take precedence over files in the user natvis directory,
1009+
which will, in turn, take precedence over files in the system-wide natvis directory.
1010+
10111011
If two entries have the same priority and cannot otherwise be disambiguated, it is unspecified which one will get used.
10121012
</xs:documentation>
10131013
</xs:annotation>

Extension/CHANGELOG.md

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

3+
## Version 1.7.1: October 19, 2021
4+
### Bug Fixes
5+
* Fix an extension crash that occurred on activation while a workspace is open with no folders in it. [#8280](https://github.com/microsoft/vscode-cpptools/issues/8280)
6+
* Fix an issue in which configuration defaults were not properly applied. [#8298](https://github.com/microsoft/vscode-cpptools/pull/8298)
7+
38
## Version 1.7.0: October 13, 2021
49
### New Features
510
* Add a command to restart IntelliSense for a specific file. [#3727](https://github.com/microsoft/vscode-cpptools/issues/3727)

Extension/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ C/C++ extension tutorials per compiler and platform
1717
* [Clang on macOS](https://code.visualstudio.com/docs/cpp/config-clang-mac)
1818

1919
## Quick links
20-
* [Editing features (IntelliSense)](https://code.visualstudio.com/docs/cpp/cpp-ide)
20+
* [Editing features (IntelliSense)](https://code.visualstudio.com/docs/cpp/cpp-ide)
2121
* [IntelliSense configuration](https://code.visualstudio.com/docs/cpp/customize-default-settings-cpp)
2222
* [Enhanced colorization](https://code.visualstudio.com/docs/cpp/colorization-cpp)
2323
* [Debugging](https://code.visualstudio.com/docs/cpp/cpp-debug)

Extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cpptools",
33
"displayName": "C/C++",
44
"description": "C/C++ IntelliSense, debugging, and code browsing.",
5-
"version": "1.7.0-main",
5+
"version": "1.7.1-main",
66
"publisher": "ms-vscode",
77
"icon": "LanguageCCPP_color_128x.png",
88
"readme": "README.md",

0 commit comments

Comments
 (0)