Skip to content

Commit d74bfea

Browse files
authored
Merge branch 'main' into feature/cpp11-thread-sample
2 parents 2441261 + 84abc3a commit d74bfea

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Build/cg/cg.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ trigger:
44
include:
55
- main
66
- release
7+
- insiders
78

89
schedules:
910
- cron: 30 5 * * 0

Extension/src/LanguageServer/client.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,8 @@ const CppContextRequest: RequestType<TextDocumentIdentifier, ChatContextResult,
624624
const CopilotCompletionContextRequest: RequestType<CopilotCompletionContextParams, CopilotCompletionContextResult, void> = new RequestType<CopilotCompletionContextParams, CopilotCompletionContextResult, void>('cpptools/getCompletionContext');
625625

626626
// Notifications to the server
627-
const DidOpenNotification: NotificationType<DidOpenTextDocumentParams> = new NotificationType<DidOpenTextDocumentParams>('textDocument/didOpen'); const FileCreatedNotification: NotificationType<FileChangedParams> = new NotificationType<FileChangedParams>('cpptools/fileCreated');
627+
const DidOpenNotification: NotificationType<DidOpenTextDocumentParams> = new NotificationType<DidOpenTextDocumentParams>('textDocument/didOpen');
628+
const FileCreatedNotification: NotificationType<FileChangedParams> = new NotificationType<FileChangedParams>('cpptools/fileCreated');
628629
const FileChangedNotification: NotificationType<FileChangedParams> = new NotificationType<FileChangedParams>('cpptools/fileChanged');
629630
const FileDeletedNotification: NotificationType<FileChangedParams> = new NotificationType<FileChangedParams>('cpptools/fileDeleted');
630631
const ResetDatabaseNotification: NotificationType<void> = new NotificationType<void>('cpptools/resetDatabase');
@@ -2654,7 +2655,7 @@ export class DefaultClient implements Client {
26542655
});
26552656

26562657
// TODO: Handle new associations without a reload.
2657-
this.associations_for_did_change = new Set<string>(["cu", "cuh", "c", "i", "cpp", "cc", "cxx", "c++", "cp", "hpp", "hh", "hxx", "h++", "hp", "h", "ii", "ino", "inl", "ipp", "tcc", "idl"]);
2658+
this.associations_for_did_change = new Set<string>(["cu", "cuh", "c", "i", "cpp", "cc", "cxx", "c++", "cp", "hpp", "hh", "hxx", "h++", "hp", "h", "ii", "ino", "inl", "ipp", "tcc", "txx", "tpp", "idl"]);
26582659
const assocs: any = new OtherSettings().filesAssociations;
26592660
for (const assoc in assocs) {
26602661
const dotIndex: number = assoc.lastIndexOf('.');

Extension/src/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export function getVcpkgRoot(): string {
165165
export function isHeaderFile(uri: vscode.Uri): boolean {
166166
const fileExt: string = path.extname(uri.fsPath);
167167
const fileExtLower: string = fileExt.toLowerCase();
168-
return !fileExt || [".cuh", ".hpp", ".hh", ".hxx", ".h++", ".hp", ".h", ".inl", ".ipp", ".tcc", ".tlh", ".tli", ""].some(ext => fileExtLower === ext);
168+
return !fileExt || [".cuh", ".hpp", ".hh", ".hxx", ".h++", ".hp", ".h", ".inl", ".ipp", ".tcc", ".txx", ".tpp", ".tlh", ".tli", ""].some(ext => fileExtLower === ext);
169169
}
170170

171171
export function isCppFile(uri: vscode.Uri): boolean {

0 commit comments

Comments
 (0)