Skip to content

Commit b1bbd7d

Browse files
jahnvi480jahnvi480
committed
Resolving conflicts
2 parents 27310da + 4d2634a commit b1bbd7d

File tree

4 files changed

+1980
-5737
lines changed

4 files changed

+1980
-5737
lines changed

‎.vscode/settings.json‎

Lines changed: 252 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,252 @@
1+
{
2+
"C_Cpp_Runner.cCompilerPath": "gcc",
3+
"C_Cpp_Runner.cppCompilerPath": "g++",
4+
"C_Cpp_Runner.debuggerPath": "gdb",
5+
"C_Cpp_Runner.cStandard": "",
6+
"C_Cpp_Runner.cppStandard": "",
7+
"C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat",
8+
"C_Cpp_Runner.useMsvc": false,
9+
"C_Cpp_Runner.warnings": [
10+
"-Wall",
11+
"-Wextra",
12+
"-Wpedantic",
13+
"-Wshadow",
14+
"-Wformat=2",
15+
"-Wcast-align",
16+
"-Wconversion",
17+
"-Wsign-conversion",
18+
"-Wnull-dereference"
19+
],
20+
"C_Cpp_Runner.msvcWarnings": [
21+
"/W4",
22+
"/permissive-",
23+
"/w14242",
24+
"/w14287",
25+
"/w14296",
26+
"/w14311",
27+
"/w14826",
28+
"/w44062",
29+
"/w44242",
30+
"/w14905",
31+
"/w14906",
32+
"/w14263",
33+
"/w44265",
34+
"/w14928"
35+
],
36+
"C_Cpp_Runner.enableWarnings": true,
37+
"C_Cpp_Runner.warningsAsError": false,
38+
"C_Cpp_Runner.compilerArgs": [],
39+
"C_Cpp_Runner.linkerArgs": [],
40+
"C_Cpp_Runner.includePaths": [],
41+
"C_Cpp_Runner.includeSearch": [
42+
"*",
43+
"**/*"
44+
],
45+
"C_Cpp_Runner.excludeSearch": [
46+
"**/build",
47+
"**/build/**",
48+
"**/.*",
49+
"**/.*/**",
50+
"**/.vscode",
51+
"**/.vscode/**"
52+
],
53+
"C_Cpp_Runner.useAddressSanitizer": false,
54+
"C_Cpp_Runner.useUndefinedSanitizer": false,
55+
"C_Cpp_Runner.useLeakSanitizer": false,
56+
"C_Cpp_Runner.showCompilationTime": false,
57+
"C_Cpp_Runner.useLinkTimeOptimization": false,
58+
"C_Cpp_Runner.msvcSecureNoWarnings": false,
59+
"python.testing.pytestArgs": [
60+
"mssql_python"
61+
],
62+
"python.testing.unittestEnabled": false,
63+
"python.testing.pytestEnabled": true,
64+
"files.associations": {
65+
"stdexcept": "cpp",
66+
"array": "cpp",
67+
"atomic": "cpp",
68+
"bit": "cpp",
69+
"cctype": "cpp",
70+
"charconv": "cpp",
71+
"chrono": "cpp",
72+
"clocale": "cpp",
73+
"cmath": "cpp",
74+
"codecvt": "cpp",
75+
"compare": "cpp",
76+
"concepts": "cpp",
77+
"condition_variable": "cpp",
78+
"cstdarg": "cpp",
79+
"cstddef": "cpp",
80+
"cstdint": "cpp",
81+
"cstdio": "cpp",
82+
"cstdlib": "cpp",
83+
"ctime": "cpp",
84+
"cwchar": "cpp",
85+
"cwctype": "cpp",
86+
"deque": "cpp",
87+
"string": "cpp",
88+
"unordered_map": "cpp",
89+
"vector": "cpp",
90+
"exception": "cpp",
91+
"algorithm": "cpp",
92+
"functional": "cpp",
93+
"iterator": "cpp",
94+
"memory": "cpp",
95+
"memory_resource": "cpp",
96+
"numeric": "cpp",
97+
"optional": "cpp",
98+
"random": "cpp",
99+
"ratio": "cpp",
100+
"string_view": "cpp",
101+
"system_error": "cpp",
102+
"tuple": "cpp",
103+
"type_traits": "cpp",
104+
"utility": "cpp",
105+
"format": "cpp",
106+
"fstream": "cpp",
107+
"initializer_list": "cpp",
108+
"iomanip": "cpp",
109+
"iosfwd": "cpp",
110+
"iostream": "cpp",
111+
"istream": "cpp",
112+
"limits": "cpp",
113+
"mutex": "cpp",
114+
"new": "cpp",
115+
"numbers": "cpp",
116+
"ostream": "cpp",
117+
"semaphore": "cpp",
118+
"span": "cpp",
119+
"sstream": "cpp",
120+
"stop_token": "cpp",
121+
"streambuf": "cpp",
122+
"text_encoding": "cpp",
123+
"thread": "cpp",
124+
"typeinfo": "cpp",
125+
"variant": "cpp",
126+
"list": "cpp",
127+
"complex": "cpp",
128+
"cstring": "cpp",
129+
"forward_list": "cpp",
130+
"map": "cpp",
131+
"set": "cpp",
132+
"unordered_set": "cpp",
133+
"ranges": "cpp",
134+
"typeindex": "cpp",
135+
"valarray": "cpp",
136+
"bitset": "cpp",
137+
"regex": "cpp",
138+
"xlocale": "cpp",
139+
"filesystem": "cpp",
140+
"ios": "cpp",
141+
"locale": "cpp",
142+
"stack": "cpp",
143+
"xfacet": "cpp",
144+
"xhash": "cpp",
145+
"xiosbase": "cpp",
146+
"xlocbuf": "cpp",
147+
"xlocinfo": "cpp",
148+
"xlocmes": "cpp",
149+
"xlocmon": "cpp",
150+
"xlocnum": "cpp",
151+
"xloctime": "cpp",
152+
"xmemory": "cpp",
153+
"xstring": "cpp",
154+
"xtr1common": "cpp",
155+
"xtree": "cpp",
156+
"xutility": "cpp"
157+
},
158+
"cmake.sourceDirectory": "C:/Users/jathakkar/OneDrive - Microsoft/Documents/Github_mssql_python/New/mssql-python/mssql_python/pybind",
159+
"python.linting.pylintEnabled": true,
160+
"python.linting.enabled": true,
161+
"python.linting.pylintArgs": [
162+
"--disable=fixme,no-member,too-many-arguments,too-many-positional-arguments,invalid-name,useless-parent-delegation"
163+
],
164+
"C_Cpp.cppStandard": "c++14",
165+
"C_Cpp.clang_format_style": "file",
166+
"C_Cpp.clang_format_path": "clang-format",
167+
// Auto-format on save
168+
"editor.formatOnSave": true,
169+
"editor.formatOnPaste": false,
170+
"editor.formatOnType": false,
171+
// Python formatting (using Black - Microsoft's recommended formatter)
172+
"[python]": {
173+
"editor.formatOnSave": true,
174+
"editor.defaultFormatter": "ms-python.black-formatter",
175+
"editor.codeActionsOnSave": {
176+
"source.organizeImports": "explicit"
177+
}
178+
},
179+
// Black formatter settings (following Microsoft guidelines)
180+
"black-formatter.args": [
181+
"--line-length=100"
182+
],
183+
// Python linting
184+
"python.linting.flake8Enabled": true,
185+
"python.linting.flake8Args": [
186+
"--max-line-length=100",
187+
"--extend-ignore=E203,W503"
188+
],
189+
// C++ formatting (using clang-format with .clang-format file)
190+
"[cpp]": {
191+
"editor.formatOnSave": true,
192+
"editor.defaultFormatter": "xaver.clang-format",
193+
"editor.formatOnPaste": false,
194+
"editor.formatOnType": false,
195+
"editor.codeActionsOnSave": {
196+
"source.fixAll": "explicit"
197+
}
198+
},
199+
"[c]": {
200+
"editor.formatOnSave": true,
201+
"editor.defaultFormatter": "ms-vscode.cpptools",
202+
"editor.formatOnPaste": false,
203+
"editor.formatOnType": false,
204+
"editor.codeActionsOnSave": {
205+
"source.fixAll": "explicit"
206+
}
207+
},
208+
"[h]": {
209+
"editor.formatOnSave": true,
210+
"editor.defaultFormatter": "ms-vscode.cpptools"
211+
},
212+
"[hpp]": {
213+
"editor.formatOnSave": true,
214+
"editor.defaultFormatter": "ms-vscode.cpptools"
215+
},
216+
// C++ IntelliSense settings
217+
"C_Cpp.formatting": "clangFormat",
218+
"C_Cpp.clang_format_fallbackStyle": "LLVM",
219+
"C_Cpp.clang_format_sortIncludes": true,
220+
// Disable conflicting formatters
221+
"clang-format.executable": "",
222+
"clang-format.style": "file",
223+
// C++ Linting with cpplint
224+
"cpplint.cpplintPath": "python3 -m cpplint",
225+
"cpplint.lintMode": "workspace",
226+
"cpplint.filters": [
227+
"-legal/copyright",
228+
"-build/include_subdir",
229+
"-build/c++11"
230+
],
231+
"cpplint.lineLength": 100,
232+
// Python type checking (Pylance) - Microsoft's recommended settings
233+
"python.analysis.typeCheckingMode": "basic",
234+
"python.analysis.autoImportCompletions": true,
235+
"python.analysis.diagnosticMode": "workspace",
236+
"python.analysis.inlayHints.functionReturnTypes": true,
237+
"python.analysis.inlayHints.variableTypes": true,
238+
"python.analysis.inlayHints.parameterTypes": true,
239+
// Additional Python analysis settings
240+
"python.analysis.diagnosticSeverityOverrides": {
241+
"reportMissingTypeStubs": "none",
242+
"reportUnknownMemberType": "none",
243+
"reportUnknownVariableType": "none",
244+
"reportUnknownArgumentType": "none",
245+
"reportGeneralTypeIssues": "warning",
246+
"reportOptionalMemberAccess": "warning",
247+
"reportOptionalSubscript": "warning",
248+
"reportPrivateUsage": "warning",
249+
"reportUnusedImport": "information",
250+
"reportUnusedVariable": "warning"
251+
}
252+
}

0 commit comments

Comments
 (0)