Commit e2ded77
fix(merge): post-second-merge cleanup — Wiki Browser lint + 1x9 toolbar tests
Two failures appeared after the second merge from main brought in
v4.0's Phase 1034 Wiki Browser (PR #159):
1. MATLAB Lint — libs/Help/WikiPageIndex.m had two
operator_after_continuation style violations (`&& strncmp(...)`
on a continuation line). Moved the operators to the end of the
previous line. mh_style reports clean.
2. MATLAB Tests (E-I) — TestFastSenseCompanionPlantLogToolbar still
expected the 1x8 toolbar grid from the prior merge. After the
v4.0 Wiki button was inserted (now col 7), the grid is 1x9 and
the gear moved from col 8 to col 9. Updated:
- findToolbarGrid_ helper to look for 9-column ColumnWidth
{110,110,110,130,70,90,70,'1x',36}
- testToolbarGridIs1x5 (still called by that name for
historical reasons) to assert col-by-col for all 9 columns
- testSettingsButtonMovedToCol5 to expect col 9
Local: 11/11 pass on MATLAB R2025b.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>1 parent 5d23f3a commit e2ded77
2 files changed
Lines changed: 19 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
84 | | - | |
85 | | - | |
| 84 | + | |
| 85 | + | |
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
| |||
381 | 381 | | |
382 | 382 | | |
383 | 383 | | |
384 | | - | |
385 | | - | |
| 384 | + | |
| 385 | + | |
386 | 386 | | |
387 | 387 | | |
388 | 388 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
117 | | - | |
118 | | - | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
119 | 120 | | |
120 | 121 | | |
121 | 122 | | |
122 | 123 | | |
123 | | - | |
| 124 | + | |
124 | 125 | | |
125 | 126 | | |
126 | 127 | | |
127 | 128 | | |
128 | | - | |
| 129 | + | |
129 | 130 | | |
130 | 131 | | |
131 | 132 | | |
| |||
138 | 139 | | |
139 | 140 | | |
140 | 141 | | |
141 | | - | |
| 142 | + | |
| 143 | + | |
142 | 144 | | |
143 | 145 | | |
144 | 146 | | |
145 | 147 | | |
146 | 148 | | |
147 | 149 | | |
148 | | - | |
149 | | - | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
150 | 153 | | |
151 | 154 | | |
152 | 155 | | |
| |||
159 | 162 | | |
160 | 163 | | |
161 | 164 | | |
162 | | - | |
163 | | - | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
164 | 168 | | |
165 | 169 | | |
166 | 170 | | |
| |||
212 | 216 | | |
213 | 217 | | |
214 | 218 | | |
215 | | - | |
216 | | - | |
| 219 | + | |
| 220 | + | |
217 | 221 | | |
218 | 222 | | |
219 | 223 | | |
| |||
0 commit comments