Skip to content

Commit e1d2679

Browse files
committed
cosmetic: added shortcut variable for library manager
1 parent 268c857 commit e1d2679

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

commands/instances.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,18 +141,19 @@ func Create(req *rpc.CreateRequest, extraUserAgent ...string) (*rpc.CreateRespon
141141
)
142142

143143
// Create library manager and add libraries directories
144-
instance.lm = librariesmanager.NewLibraryManager(
144+
lm := librariesmanager.NewLibraryManager(
145145
dataDir,
146146
downloadsDir,
147147
)
148+
instance.lm = lm
148149

149150
// Add directories of libraries bundled with IDE
150151
if bundledLibsDir := configuration.IDEBundledLibrariesDir(configuration.Settings); bundledLibsDir != nil {
151-
instance.lm.AddLibrariesDir(bundledLibsDir, libraries.IDEBuiltIn)
152+
lm.AddLibrariesDir(bundledLibsDir, libraries.IDEBuiltIn)
152153
}
153154

154155
// Add libraries directory from config file
155-
instance.lm.AddLibrariesDir(
156+
lm.AddLibrariesDir(
156157
configuration.LibrariesDir(configuration.Settings),
157158
libraries.User,
158159
)
@@ -289,21 +290,23 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
289290
responseError(s.ToRPCStatus())
290291
}
291292

293+
lm := instance.lm
294+
292295
// Load libraries
293296
for _, pack := range instance.PackageManager.Packages {
294297
for _, platform := range pack.Platforms {
295298
if platformRelease := instance.PackageManager.GetInstalledPlatformRelease(platform); platformRelease != nil {
296-
instance.lm.AddPlatformReleaseLibrariesDir(platformRelease, libraries.PlatformBuiltIn)
299+
lm.AddPlatformReleaseLibrariesDir(platformRelease, libraries.PlatformBuiltIn)
297300
}
298301
}
299302
}
300303

301-
if err := instance.lm.LoadIndex(); err != nil {
304+
if err := lm.LoadIndex(); err != nil {
302305
s := status.Newf(codes.FailedPrecondition, tr("Loading index file: %v"), err)
303306
responseError(s)
304307
}
305308

306-
for _, err := range instance.lm.RescanLibraries() {
309+
for _, err := range lm.RescanLibraries() {
307310
s := status.Newf(codes.FailedPrecondition, tr("Loading libraries: %v"), err)
308311
responseError(s)
309312
}

0 commit comments

Comments
 (0)